Refactoring project structure a little