clean up directory structure