Restructure

Restructured everything now that we know how we want to assign controllers, etc.