Geometry & projection refactoring