Almost finished refactoring to the new structure
Almost finished refactoring to the new structure
Removed old modules