Basic layout now complete

pieces have been moved into the correct places, need to flesh out the
content, and polish the style