Basic site-structure taking shape.
Clean up markup and links.