Refactored all entity types. Now it makes sense for them to be subclasses of Entity and it is better code (not much had to be or even could be done, though: This is pretty much finished)