This is the end to the confusion

Finally, everything is properly on one file.  There should be no such
problems from here on out.