Simple project refactoring