Project refactoring 6th phase