Moved a bunch of view files around