Cleaned up structure of files in Finder to match structure in Xcode