Project refactoring done