Added haddock-style comments.
Added --no-wrap option.
Restructured modules.