flatten the directory structure
more dir cleanup