Revert "moved test cli to its own folder"

This reverts commit 56af811d8d5cc63e376410f4b6d0b27767848ab8.
removed redefinitions of FileDeleter
Merge pull request #8 from scopatz/tk

Tk File Deleter Fixes