minor changes in the file hierarchy