diff --git a/app/src/main/java/de/sebse/fuplanner/MainActivity.java b/app/src/main/java/de/sebse/fuplanner/MainActivity.java
index 845399d..1c243ed 100644
--- a/app/src/main/java/de/sebse/fuplanner/MainActivity.java
+++ b/app/src/main/java/de/sebse/fuplanner/MainActivity.java
@@ -36,14 +36,14 @@ import de.sebse.fuplanner.fragments.ScheduleFragment;
 import de.sebse.fuplanner.fragments.StartupFragment;
 import de.sebse.fuplanner.fragments.canteen.DaySwitcherFragment;
 import de.sebse.fuplanner.fragments.moddetails.ModDetailFragment;
-import de.sebse.fuplanner.services.Canteen.CanteenBrowser;
-import de.sebse.fuplanner.services.Canteen.types.Canteen;
-import de.sebse.fuplanner.services.Canteen.types.CanteenListener;
+import de.sebse.fuplanner.services.canteen.CanteenBrowser;
+import de.sebse.fuplanner.services.canteen.types.Canteen;
+import de.sebse.fuplanner.services.canteen.types.CanteenListener;
 import de.sebse.fuplanner.services.kvv.KVV;
 import de.sebse.fuplanner.services.kvv.KVVListener;
 import de.sebse.fuplanner.services.kvv.types.LoginToken;
 import de.sebse.fuplanner.services.kvv.types.Modules;
-import de.sebse.fuplanner.services.News.NewsManager;
+import de.sebse.fuplanner.services.news.NewsManager;
 import de.sebse.fuplanner.services.fulogin.AccountGeneral;
 import de.sebse.fuplanner.tools.CustomAccountManager;
 import de.sebse.fuplanner.tools.MainActivityListener;
@@ -144,16 +144,13 @@ public class MainActivity extends AppCompatActivity
         super.onPause();
         isPaused = true;
         isLoggedInBeforePause = getKVV().account().isLoggedIn();
-        log.d("onPause", isPaused, isLoggedInBeforePause);
     }
 
     @Override
     protected void onResume() {
         super.onResume();
-        log.d("onResume", isPaused, isLoggedInBeforePause);
         if (isPaused) {
             getKVV().account().restoreOnlineLogin(isRestored -> {
-                log.d("onResume", isRestored);
                 updateNavigation();
                 if (isRestored && !isLoggedInBeforePause)
                     changeFragment(getDefaultFragmentAfterLogin());
diff --git a/app/src/main/java/de/sebse/fuplanner/fragments/CanteensAdapter.java b/app/src/main/java/de/sebse/fuplanner/fragments/CanteensAdapter.java
index db8acb2..3b99e5d 100644
--- a/app/src/main/java/de/sebse/fuplanner/fragments/CanteensAdapter.java
+++ b/app/src/main/java/de/sebse/fuplanner/fragments/CanteensAdapter.java
@@ -8,8 +8,8 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import de.sebse.fuplanner.R;
 import de.sebse.fuplanner.fragments.CanteensFragment.OnCanteensFragmentInteractionListener;
-import de.sebse.fuplanner.services.Canteen.types.Canteen;
-import de.sebse.fuplanner.services.Canteen.types.Canteens;
+import de.sebse.fuplanner.services.canteen.types.Canteen;
+import de.sebse.fuplanner.services.canteen.types.Canteens;
 import de.sebse.fuplanner.tools.ui.ItemViewHolder;
 
 /**
diff --git a/app/src/main/java/de/sebse/fuplanner/fragments/CanteensFragment.java b/app/src/main/java/de/sebse/fuplanner/fragments/CanteensFragment.java
index 99d838d..6612471 100644
--- a/app/src/main/java/de/sebse/fuplanner/fragments/CanteensFragment.java
+++ b/app/src/main/java/de/sebse/fuplanner/fragments/CanteensFragment.java
@@ -13,7 +13,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import de.sebse.fuplanner.MainActivity;
 import de.sebse.fuplanner.R;
-import de.sebse.fuplanner.services.Canteen.CanteenBrowser;
+import de.sebse.fuplanner.services.canteen.CanteenBrowser;
 import de.sebse.fuplanner.tools.MainActivityListener;
 import de.sebse.fuplanner.tools.logging.Logger;
 
diff --git a/app/src/main/java/de/sebse/fuplanner/fragments/canteen/DaySwitcherAdapter.java b/app/src/main/java/de/sebse/fuplanner/fragments/canteen/DaySwitcherAdapter.java
index d9bfcca..b47436c 100644
--- a/app/src/main/java/de/sebse/fuplanner/fragments/canteen/DaySwitcherAdapter.java
+++ b/app/src/main/java/de/sebse/fuplanner/fragments/canteen/DaySwitcherAdapter.java
@@ -4,7 +4,7 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentStatePagerAdapter;
 
-import de.sebse.fuplanner.services.Canteen.types.Canteen;
+import de.sebse.fuplanner.services.canteen.types.Canteen;
 import de.sebse.fuplanner.tools.UtilsDate;
 
 class DaySwitcherAdapter extends FragmentStatePagerAdapter {
diff --git a/app/src/main/java/de/sebse/fuplanner/fragments/canteen/DaySwitcherFragment.java b/app/src/main/java/de/sebse/fuplanner/fragments/canteen/DaySwitcherFragment.java
index 0150508..5fe8bf8 100644
--- a/app/src/main/java/de/sebse/fuplanner/fragments/canteen/DaySwitcherFragment.java
+++ b/app/src/main/java/de/sebse/fuplanner/fragments/canteen/DaySwitcherFragment.java
@@ -11,8 +11,8 @@ import androidx.fragment.app.Fragment;
 import androidx.viewpager.widget.ViewPager;
 import de.sebse.fuplanner.MainActivity;
 import de.sebse.fuplanner.R;
-import de.sebse.fuplanner.services.Canteen.CanteenBrowser;
-import de.sebse.fuplanner.services.Canteen.types.Canteen;
+import de.sebse.fuplanner.services.canteen.CanteenBrowser;
+import de.sebse.fuplanner.services.canteen.types.Canteen;
 import de.sebse.fuplanner.tools.MainActivityListener;
 import de.sebse.fuplanner.tools.logging.Logger;
 import de.sebse.fuplanner.tools.network.NetworkCallback;
diff --git a/app/src/main/java/de/sebse/fuplanner/fragments/canteen/DaySwitcherListener.java b/app/src/main/java/de/sebse/fuplanner/fragments/canteen/DaySwitcherListener.java
index 8fdc87d..909deca 100644
--- a/app/src/main/java/de/sebse/fuplanner/fragments/canteen/DaySwitcherListener.java
+++ b/app/src/main/java/de/sebse/fuplanner/fragments/canteen/DaySwitcherListener.java
@@ -1,6 +1,6 @@
 package de.sebse.fuplanner.fragments.canteen;
 
-import de.sebse.fuplanner.services.Canteen.types.Canteen;
+import de.sebse.fuplanner.services.canteen.types.Canteen;
 import de.sebse.fuplanner.tools.network.NetworkCallback;
 import de.sebse.fuplanner.tools.network.NetworkErrorCallback;
 
diff --git a/app/src/main/java/de/sebse/fuplanner/fragments/canteen/MealAdapter.java b/app/src/main/java/de/sebse/fuplanner/fragments/canteen/MealAdapter.java
index 1534f54..21fee6b 100644
--- a/app/src/main/java/de/sebse/fuplanner/fragments/canteen/MealAdapter.java
+++ b/app/src/main/java/de/sebse/fuplanner/fragments/canteen/MealAdapter.java
@@ -13,8 +13,8 @@ import androidx.annotation.NonNull;
 import androidx.annotation.StringRes;
 import androidx.recyclerview.widget.RecyclerView;
 import de.sebse.fuplanner.R;
-import de.sebse.fuplanner.services.Canteen.types.Day;
-import de.sebse.fuplanner.services.Canteen.types.Meal;
+import de.sebse.fuplanner.services.canteen.types.Day;
+import de.sebse.fuplanner.services.canteen.types.Meal;
 import de.sebse.fuplanner.tools.Preferences;
 import de.sebse.fuplanner.tools.ui.MealViewHolder;
 import de.sebse.fuplanner.tools.ui.StringViewHolder;
diff --git a/app/src/main/java/de/sebse/fuplanner/fragments/canteen/MealFragment.java b/app/src/main/java/de/sebse/fuplanner/fragments/canteen/MealFragment.java
index 4b42f30..ad1e46b 100644
--- a/app/src/main/java/de/sebse/fuplanner/fragments/canteen/MealFragment.java
+++ b/app/src/main/java/de/sebse/fuplanner/fragments/canteen/MealFragment.java
@@ -13,9 +13,9 @@ import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import de.sebse.fuplanner.MainActivity;
 import de.sebse.fuplanner.R;
-import de.sebse.fuplanner.services.Canteen.CanteenBrowser;
-import de.sebse.fuplanner.services.Canteen.types.Canteen;
-import de.sebse.fuplanner.services.Canteen.types.Day;
+import de.sebse.fuplanner.services.canteen.CanteenBrowser;
+import de.sebse.fuplanner.services.canteen.types.Canteen;
+import de.sebse.fuplanner.services.canteen.types.Day;
 import de.sebse.fuplanner.tools.logging.Logger;
 
 /**
diff --git a/app/src/main/java/de/sebse/fuplanner/services/Canteen/CanteenBrowser.java b/app/src/main/java/de/sebse/fuplanner/services/canteen/CanteenBrowser.java
similarity index 97%
rename from app/src/main/java/de/sebse/fuplanner/services/Canteen/CanteenBrowser.java
rename to app/src/main/java/de/sebse/fuplanner/services/canteen/CanteenBrowser.java
index 9ae6fdb..3869c63 100644
--- a/app/src/main/java/de/sebse/fuplanner/services/Canteen/CanteenBrowser.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/canteen/CanteenBrowser.java
@@ -1,4 +1,4 @@
-package de.sebse.fuplanner.services.Canteen;
+package de.sebse.fuplanner.services.canteen;
 
 import android.content.Context;
 
@@ -8,10 +8,10 @@ import org.json.JSONObject;
 
 import java.io.IOException;
 
-import de.sebse.fuplanner.services.Canteen.types.Canteen;
-import de.sebse.fuplanner.services.Canteen.types.CanteenListener;
-import de.sebse.fuplanner.services.Canteen.types.Canteens;
-import de.sebse.fuplanner.services.Canteen.types.Day;
+import de.sebse.fuplanner.services.canteen.types.Canteen;
+import de.sebse.fuplanner.services.canteen.types.CanteenListener;
+import de.sebse.fuplanner.services.canteen.types.Canteens;
+import de.sebse.fuplanner.services.canteen.types.Day;
 import de.sebse.fuplanner.tools.AsyncQueue;
 import de.sebse.fuplanner.tools.network.HTTPService;
 import de.sebse.fuplanner.tools.network.NetworkCallback;
diff --git a/app/src/main/java/de/sebse/fuplanner/services/Canteen/types/Canteen.java b/app/src/main/java/de/sebse/fuplanner/services/canteen/types/Canteen.java
similarity index 98%
rename from app/src/main/java/de/sebse/fuplanner/services/Canteen/types/Canteen.java
rename to app/src/main/java/de/sebse/fuplanner/services/canteen/types/Canteen.java
index b74aa1b..a6d928b 100644
--- a/app/src/main/java/de/sebse/fuplanner/services/Canteen/types/Canteen.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/canteen/types/Canteen.java
@@ -1,4 +1,4 @@
-package de.sebse.fuplanner.services.Canteen.types;
+package de.sebse.fuplanner.services.canteen.types;
 
 import androidx.annotation.NonNull;
 
diff --git a/app/src/main/java/de/sebse/fuplanner/services/Canteen/types/CanteenListener.java b/app/src/main/java/de/sebse/fuplanner/services/canteen/types/CanteenListener.java
similarity index 62%
rename from app/src/main/java/de/sebse/fuplanner/services/Canteen/types/CanteenListener.java
rename to app/src/main/java/de/sebse/fuplanner/services/canteen/types/CanteenListener.java
index f6d36c1..1ed10d4 100644
--- a/app/src/main/java/de/sebse/fuplanner/services/Canteen/types/CanteenListener.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/canteen/types/CanteenListener.java
@@ -1,4 +1,4 @@
-package de.sebse.fuplanner.services.Canteen.types;
+package de.sebse.fuplanner.services.canteen.types;
 
 public interface CanteenListener {
     void onCanteenRefreshCompleted(boolean b);
diff --git a/app/src/main/java/de/sebse/fuplanner/services/Canteen/types/Canteens.java b/app/src/main/java/de/sebse/fuplanner/services/canteen/types/Canteens.java
similarity index 98%
rename from app/src/main/java/de/sebse/fuplanner/services/Canteen/types/Canteens.java
rename to app/src/main/java/de/sebse/fuplanner/services/canteen/types/Canteens.java
index a02cf56..d3ddfee 100644
--- a/app/src/main/java/de/sebse/fuplanner/services/Canteen/types/Canteens.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/canteen/types/Canteens.java
@@ -1,4 +1,4 @@
-package de.sebse.fuplanner.services.Canteen.types;
+package de.sebse.fuplanner.services.canteen.types;
 
 import android.content.Context;
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/de/sebse/fuplanner/services/Canteen/types/Day.java b/app/src/main/java/de/sebse/fuplanner/services/canteen/types/Day.java
similarity index 96%
rename from app/src/main/java/de/sebse/fuplanner/services/Canteen/types/Day.java
rename to app/src/main/java/de/sebse/fuplanner/services/canteen/types/Day.java
index 4367d40..3699614 100644
--- a/app/src/main/java/de/sebse/fuplanner/services/Canteen/types/Day.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/canteen/types/Day.java
@@ -1,4 +1,4 @@
-package de.sebse.fuplanner.services.Canteen.types;
+package de.sebse.fuplanner.services.canteen.types;
 
 import androidx.annotation.NonNull;
 
diff --git a/app/src/main/java/de/sebse/fuplanner/services/Canteen/types/Meal.java b/app/src/main/java/de/sebse/fuplanner/services/canteen/types/Meal.java
similarity index 98%
rename from app/src/main/java/de/sebse/fuplanner/services/Canteen/types/Meal.java
rename to app/src/main/java/de/sebse/fuplanner/services/canteen/types/Meal.java
index b265a67..ac019ae 100644
--- a/app/src/main/java/de/sebse/fuplanner/services/Canteen/types/Meal.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/canteen/types/Meal.java
@@ -1,4 +1,4 @@
-package de.sebse.fuplanner.services.Canteen.types;
+package de.sebse.fuplanner.services.canteen.types;
 
 import java.io.Serializable;
 import java.util.ArrayList;
diff --git a/app/src/main/java/de/sebse/fuplanner/services/Canteen/types/SortedListCanteen.java b/app/src/main/java/de/sebse/fuplanner/services/canteen/types/SortedListCanteen.java
similarity index 91%
rename from app/src/main/java/de/sebse/fuplanner/services/Canteen/types/SortedListCanteen.java
rename to app/src/main/java/de/sebse/fuplanner/services/canteen/types/SortedListCanteen.java
index 6beaa18..b57f98b 100644
--- a/app/src/main/java/de/sebse/fuplanner/services/Canteen/types/SortedListCanteen.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/canteen/types/SortedListCanteen.java
@@ -1,4 +1,4 @@
-package de.sebse.fuplanner.services.Canteen.types;
+package de.sebse.fuplanner.services.canteen.types;
 
 import de.sebse.fuplanner.tools.SortedList;
 
diff --git a/app/src/main/java/de/sebse/fuplanner/services/Canteen/types/SortedListDay.java b/app/src/main/java/de/sebse/fuplanner/services/canteen/types/SortedListDay.java
similarity index 91%
rename from app/src/main/java/de/sebse/fuplanner/services/Canteen/types/SortedListDay.java
rename to app/src/main/java/de/sebse/fuplanner/services/canteen/types/SortedListDay.java
index 8ded38d..790880b 100644
--- a/app/src/main/java/de/sebse/fuplanner/services/Canteen/types/SortedListDay.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/canteen/types/SortedListDay.java
@@ -1,4 +1,4 @@
-package de.sebse.fuplanner.services.Canteen.types;
+package de.sebse.fuplanner.services.canteen.types;
 
 import java.util.Calendar;
 
diff --git a/app/src/main/java/de/sebse/fuplanner/services/Canteen/types/SortedListMeal.java b/app/src/main/java/de/sebse/fuplanner/services/canteen/types/SortedListMeal.java
similarity index 90%
rename from app/src/main/java/de/sebse/fuplanner/services/Canteen/types/SortedListMeal.java
rename to app/src/main/java/de/sebse/fuplanner/services/canteen/types/SortedListMeal.java
index 8c5d090..57064f4 100644
--- a/app/src/main/java/de/sebse/fuplanner/services/Canteen/types/SortedListMeal.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/canteen/types/SortedListMeal.java
@@ -1,4 +1,4 @@
-package de.sebse.fuplanner.services.Canteen.types;
+package de.sebse.fuplanner.services.canteen.types;
 
 import de.sebse.fuplanner.tools.SortedList;
 
diff --git a/app/src/main/java/de/sebse/fuplanner/services/News/NewsManager.java b/app/src/main/java/de/sebse/fuplanner/services/news/NewsManager.java
similarity index 98%
rename from app/src/main/java/de/sebse/fuplanner/services/News/NewsManager.java
rename to app/src/main/java/de/sebse/fuplanner/services/news/NewsManager.java
index 8a67a7b..1ffd446 100644
--- a/app/src/main/java/de/sebse/fuplanner/services/News/NewsManager.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/news/NewsManager.java
@@ -1,4 +1,4 @@
-package de.sebse.fuplanner.services.News;
+package de.sebse.fuplanner.services.news;
 
 import android.content.Context;
 
diff --git a/app/src/main/java/de/sebse/fuplanner/tools/MainActivityListener.java b/app/src/main/java/de/sebse/fuplanner/tools/MainActivityListener.java
index 050ac93..eb4b80e 100644
--- a/app/src/main/java/de/sebse/fuplanner/tools/MainActivityListener.java
+++ b/app/src/main/java/de/sebse/fuplanner/tools/MainActivityListener.java
@@ -2,9 +2,9 @@ package de.sebse.fuplanner.tools;
 
 import androidx.annotation.StringRes;
 
-import de.sebse.fuplanner.services.Canteen.CanteenBrowser;
+import de.sebse.fuplanner.services.canteen.CanteenBrowser;
 import de.sebse.fuplanner.services.kvv.KVV;
-import de.sebse.fuplanner.services.News.NewsManager;
+import de.sebse.fuplanner.services.news.NewsManager;
 
 public interface MainActivityListener {
     void onTitleTextChange(String newTitle);