Completed U2HW2, restructured site to use templates