Refactored localization feature
Working on sample app.