Complete reorganisation of modules that gets rid of the dodgy assembly descriptor.
Merge branch 'reorg'