- More repository refactor changes (Rock project now compiles)