restructured directories, added some fixes so the tester runs cleanly