minor changes to file hierarchy