organize folder to match Xcode structure