- Support 2 types of controller structures, class and mvc types
- Clean up