Updated file hierarchy