Moved testfolder structure
Merge pull request #30 from kotlinski/fix/clean-up-in-test-folder

Moved testfolder structure