reorganized folders to match folders in Xcode project