Project refactoring #2