Reformatted the code base so wellservice, classic and xclass pages are rendered from one template page, this reduces the code substantially.