Model and accessors along with controller reorg