more directory structure changes