cleaned up directory, standardized naming of files