Fixes for breaking ModeChange update. Also a bit of refactoring, so this module now has the same structure as official language modules.