Moved testfolder structure