Reorganized ext. files.
Merge branch 'master' of https://github.com/nervouna/testfry