Minor refactoring
Added localization app