#2 directory structure added