Refactoring project structure