Cleaned up entity directives and controllers and storerooms routes.