Little refactoring of project structure