Minor refactoring
Moving towards stand-alone flexibility
PhysicsAwareEntity factory rewrite