Remove unnecessary references to Organizer class from Settings view, optimize imports