Rumia file dir fix

Includes a bunch of things not in your Master Rumia, oh well.
This is what not Branching does.

I recommend Making a NEW branch and a new PR at this point, Don't bother with this.