Rearranged files to be less inter-environment incompatible.