Project refactoring 4th phase