Cleanup the directory structure