Reorganized Controller

This also now allows the Map interpreter to add items into the map as
real entities.