Re-organizing code
Adding tests
Adding example for l10n