Reorder controller, model, view.

Also sync up the epub and pdf contents.