Rearrange some code and comment it a bit.
Get rid of the views/ directory for now.