Revert "Refactoring, small improvements"

This reverts commit ee99ae3ecb.

This would cause existing widgets not to work anymore

app/src/main/java/eu/faircode/email/WidgetUnifiedService.java

@@ -0,0 +1,30 @@
+package eu.faircode.email;
+
+/*
+    This file is part of FairEmail.
+
+    FairEmail is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    FairEmail is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
+
+    Copyright 2018-2019 by Marcel Bokhorst (M66B)
+*/
+
+import android.content.Intent;
+import android.widget.RemoteViewsService;
+
+public class WidgetUnifiedService extends RemoteViewsService {
+    @Override
+    public RemoteViewsFactory onGetViewFactory(Intent intent) {
+        return new WidgetUnifiedRemoteViewsFactory(this.getApplicationContext(), intent);
+    }
+}