Tidy up source files
Move test file to more standard location