refactored javaee modules