Fix of file hierarchy