Major refactor into Type Controllers
Merge branch 'architect_framework' of https://github.com/cleavetv/Architect into architect_framework