Upow1234 total reorganization and refactor