re #179 Code cleanup.
re #179 Import fallback locale first.

Also added fallback for ini files using old repo structure.
re #179 Cleanup.