Added Giles
Seperated object, controller, and test classes