Rationalised file names. Fixed all tests. Wrote new tests for the BlockManager. Cleaned up old files.