move common entities to root section of config doc