Moved pages to be less ridiculous about stuff.
Removed unused layouts.