Moved rest of files into annotation generator.

Removed cobwebed ignored old unit tests.