Project refactoring 7th phase