Remove dirs, to be replaced by tgz
Moved data to data.tar.gz