Refactoring Project structure