Modular Models and Controllers

Rebased, and updated.