Clean up pom, context, web xmls and set REST