Reorganize for a different project structure