Yet more housecleaning.  I shoujld have organized before my first commit, but at least this way it is all there