Reorganisation.
more reorg
Inter-collection relationships
first integration test
bug fix
bug fixes
some new tests for the adaptor
all tests pass