All in one project refactoring