Changed directory structure so that the top level is now \lib, and \test\lib.  The code for running the experiments, analysis etc. is in \lib, the code for testing is in \test and mimics the structure of \lib.