master: removing unnecessary classes
master: code refactored in SettingsActivity and MainActivity