Move the tests to subdirectories

And fix the conf to include all the required files.