Cleanup and document modules

[jkozlowski]

The code lives on 'cleanup' branch.

[jkozlowski]

Test

[w-martin]

Is this finished? Had a quick look through the code and it all seems documented