Major reorganization and refactoring started