Switch to embedded Tomcat and more flexible configuration