File structure reorganization

Signed-off-by: Hin Lam <max21226@Hin-Lams-iMac.local>
Merge remote-tracking branch 'max21226/collisionRedo' into rotato_master

Conflicts:
	RecordRunnerARC.xcodeproj/project.pbxproj

Signed-off-by: Matt Cleveland <mgcleveland@gmail.com>
fixed merge conflicts.
Signed-off-by: Matt Cleveland <mgcleveland@gmail.com>