Switched to TomEE, split into multi-module project