Reorder the source files again, in an attempt to make them slightly