More file re-ordering.

even more housekeeping