Cleaned up the directory tree.

This involved renaming `src.new` into `src/model`, fixing the Makefile
and editing the include paths in some of the tests.
Removed the old files which made up the model.