Moved i18n to it's own module; (+1 squashed commits)

Squashed commits:

[2c9f6b5] Moved i18n to it's own module;