Project refactoring #1