more directory structure work