Project structure refactor