Tidy up main.

Controller files are missing. I will add them from local copy.