Refactoring and changed the AppServer to TomEE