Moved a few files around, added new views, refs #3