Fix bug in code
Fix so that Sample folders are being moved or deleted
Bump versions