Initial default project refactoring