fixed naming, fixed folders in tar, ready to be submitted