Refactor1

First round of clean up - pulled controller and ref data into separate
objects