Restructured project and workspace.

Fixed problem that XCode was not building and running the Test scheme/project.

Now does, so I can crack on with coding this