Added directory hierarchy