Moving out prefs from main
pylint fixes
Refactoring merge and textview to separate modules.