adjusted the file hierarchy