Changed all file loading, etc. to account for the new file extensions