Fixed the directory hierarchy