Project refactoring 5th phase