Split views into modules.

And some trivial cleaning.