Added support for 1 level deep folder structure.

Also fixed the template file and the paths in the Tester class.