Some project structure refactoring