Streamline our middleware into one file.

We have too many things called "middleware."  Now we have one.
Is this new line intended?