Refactoring project structure.