Some cleaning up, separating stuff from EntitySystem into separate headers