REFACTOR: Tidy up code organisation
REFACTOR: Tidy up code organisation

ncoelle/Slim-iOS-TestRunner,ncoelle/Slim-iOS-TestRunner,paulstringer/OCSlimProject,ncoelle/Slim-iOS-TestRunner,paulstringer/OCSlimProject,paulstringer/OCSlimProject,paulstringer/OCSlimProject,ncoelle/Slim-iOS-TestRunner