Entity refactor refactor

Cleaned up a bunch of entity-refactor, it's much smaller and simpler now. Everything should still work, with the exception of the PosHistoryBar which still has to be ported. I'm going to eat something.