revamped the directory hierarchy