some cleaning up of folder structure, re-jiggered xcode project to reflect