Adapt Java DB tutorial to new layout