Package refactoring and removal of unnecessary ListPreference duplicate