Rumia file dir fix

Includes a bunch of things not in your Master Rumia as well.
This is what not Branching does.