Entities types, type load and controllers
Cleaning up