Pre-first deploy

Removed redundant themes, added features, re-organized controllers.