Clean up folder and re-write markup for page.tpl.php