Reorganizing/flattening prebuilt middleware.