Renamed stuff, to get stuff updated and starting on entity loader
Merge branch 'EntityLoader' into develop