Honestly I have no idea what I was originally going to commit.
Split general entities into major subclasses of MovingEntity and StaticEntity, the remaining changes are modifications of methods and various static-entity abstractions.