Project structure refactoring - BEGIN