Modular models and controllers

Rebased today! :)