Moved resources, entities done???

At least the entity class is