update to modern NextGen module layout;