Moved testfolder structure

![selfie-0](http://i.imgur.com/7lh3Pxj.png)