Adapt Java EE project tutorial to new layout