Project refactoring 2nd phase