Project structure is partially refactored (not completed)