Added more directory structure