Updates to Files and Formats

Updated the file hierarchy and names of all files.