Fixed a few bugsand removed a few levels of nested folders in the tar archives