changing source directory structure, to correspond with the XCode Project