Changed things quite a bit in order to deploy as ubwewar to to Tomcat - routing not working correctly