fix up directory structure