tidy up build files and move test directory