Replaced a few modules with type extensions.
Added Cloc stuff.