diff --git a/src/main/java/com/vackosar/searchbasedlauncher/boundary/ClearHistoryAndRestart.java b/src/main/java/com/vackosar/searchbasedlauncher/boundary/ClearHistoryAndRestart.java
index 05629ed..5324463 100644
--- a/src/main/java/com/vackosar/searchbasedlauncher/boundary/ClearHistoryAndRestart.java
+++ b/src/main/java/com/vackosar/searchbasedlauncher/boundary/ClearHistoryAndRestart.java
@@ -6,6 +6,7 @@
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 import com.vackosar.searchbasedlauncher.entity.Action;
+import com.vackosar.searchbasedlauncher.entity.AppsView;
 
 @Singleton
 public class ClearHistoryAndRestart extends Action {
diff --git a/src/main/java/com/vackosar/searchbasedlauncher/boundary/MainActivity.java b/src/main/java/com/vackosar/searchbasedlauncher/boundary/MainActivity.java
index 73d2dcd..bf5426c 100644
--- a/src/main/java/com/vackosar/searchbasedlauncher/boundary/MainActivity.java
+++ b/src/main/java/com/vackosar/searchbasedlauncher/boundary/MainActivity.java
@@ -7,6 +7,7 @@
 
 import com.google.inject.Inject;
 import com.vackosar.searchbasedlauncher.R;
+import com.vackosar.searchbasedlauncher.entity.AppsView;
 
 import roboguice.activity.RoboActivity;
 import roboguice.event.EventManager;
diff --git a/src/main/java/com/vackosar/searchbasedlauncher/boundary/RecentsCountSelector.java b/src/main/java/com/vackosar/searchbasedlauncher/boundary/RecentsCountSelector.java
index 97dab32..87df7ce 100644
--- a/src/main/java/com/vackosar/searchbasedlauncher/boundary/RecentsCountSelector.java
+++ b/src/main/java/com/vackosar/searchbasedlauncher/boundary/RecentsCountSelector.java
@@ -2,6 +2,7 @@
 
 import com.google.gson.annotations.Expose;
 import com.google.inject.Inject;
+import com.vackosar.searchbasedlauncher.entity.AppsView;
 import com.vackosar.searchbasedlauncher.entity.RecentsCount;
 import com.vackosar.searchbasedlauncher.entity.SelectAction;
 
diff --git a/src/main/java/com/vackosar/searchbasedlauncher/boundary/SearchText.java b/src/main/java/com/vackosar/searchbasedlauncher/boundary/SearchText.java
index 0e2ee98..7803381 100644
--- a/src/main/java/com/vackosar/searchbasedlauncher/boundary/SearchText.java
+++ b/src/main/java/com/vackosar/searchbasedlauncher/boundary/SearchText.java
@@ -13,8 +13,8 @@
 
 import java.util.Arrays;
 
-import roboguice.activity.event.OnPauseEvent;
 import roboguice.activity.event.OnResumeEvent;
+import roboguice.activity.event.OnStopEvent;
 import roboguice.context.event.OnCreateEvent;
 import roboguice.event.Observes;
 import roboguice.inject.ContextSingleton;
@@ -45,7 +45,7 @@ private void onResume(@Observes OnResumeEvent onResumeEvent) {
         clearText();
     }
 
-    private void onPause(@Observes OnPauseEvent event) {
+    private void onStop(@Observes OnStopEvent event) {
         clearText();
     }
 
diff --git a/src/main/java/com/vackosar/searchbasedlauncher/control/AppsManager.java b/src/main/java/com/vackosar/searchbasedlauncher/control/AppsManager.java
index 79d270b..c153afb 100644
--- a/src/main/java/com/vackosar/searchbasedlauncher/control/AppsManager.java
+++ b/src/main/java/com/vackosar/searchbasedlauncher/control/AppsManager.java
@@ -4,9 +4,9 @@
 
 import com.google.gson.annotations.Expose;
 import com.google.inject.Inject;
-import com.vackosar.searchbasedlauncher.boundary.AppsFactory;
 import com.vackosar.searchbasedlauncher.boundary.ItemListSelector;
 import com.vackosar.searchbasedlauncher.entity.App;
+import com.vackosar.searchbasedlauncher.entity.AppsFactory;
 import com.vackosar.searchbasedlauncher.entity.Indentifiable;
 import com.vackosar.searchbasedlauncher.entity.SingletonPersister;
 
diff --git a/src/main/java/com/vackosar/searchbasedlauncher/boundary/AppsFactory.java b/src/main/java/com/vackosar/searchbasedlauncher/entity/AppsFactory.java
similarity index 93%
rename from src/main/java/com/vackosar/searchbasedlauncher/boundary/AppsFactory.java
rename to src/main/java/com/vackosar/searchbasedlauncher/entity/AppsFactory.java
index f48b063..a63a2de 100644
--- a/src/main/java/com/vackosar/searchbasedlauncher/boundary/AppsFactory.java
+++ b/src/main/java/com/vackosar/searchbasedlauncher/entity/AppsFactory.java
@@ -1,4 +1,4 @@
-package com.vackosar.searchbasedlauncher.boundary;
+package com.vackosar.searchbasedlauncher.entity;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -6,7 +6,8 @@
 import android.content.pm.ResolveInfo;
 
 import com.google.inject.Inject;
-import com.vackosar.searchbasedlauncher.entity.App;
+import com.vackosar.searchbasedlauncher.boundary.BluetoothToggle;
+import com.vackosar.searchbasedlauncher.boundary.WifiToggle;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/com/vackosar/searchbasedlauncher/boundary/AppsView.java b/src/main/java/com/vackosar/searchbasedlauncher/entity/AppsView.java
similarity index 95%
rename from src/main/java/com/vackosar/searchbasedlauncher/boundary/AppsView.java
rename to src/main/java/com/vackosar/searchbasedlauncher/entity/AppsView.java
index ac648c0..17a46de 100644
--- a/src/main/java/com/vackosar/searchbasedlauncher/boundary/AppsView.java
+++ b/src/main/java/com/vackosar/searchbasedlauncher/entity/AppsView.java
@@ -1,4 +1,4 @@
-package com.vackosar.searchbasedlauncher.boundary;
+package com.vackosar.searchbasedlauncher.entity;
 
 import android.app.Activity;
 import android.view.View;
@@ -8,13 +8,13 @@
 import com.google.gson.annotations.Expose;
 import com.google.inject.Inject;
 import com.vackosar.searchbasedlauncher.R;
+import com.vackosar.searchbasedlauncher.boundary.AppExecutor;
+import com.vackosar.searchbasedlauncher.boundary.AutostartSelector;
+import com.vackosar.searchbasedlauncher.boundary.SearchText;
 import com.vackosar.searchbasedlauncher.control.AppsManager;
 import com.vackosar.searchbasedlauncher.control.DialogFactory;
 import com.vackosar.searchbasedlauncher.control.PackageAddedOrRemovedEvent;
 import com.vackosar.searchbasedlauncher.control.TextViewManager;
-import com.vackosar.searchbasedlauncher.entity.App;
-import com.vackosar.searchbasedlauncher.entity.Indentifiable;
-import com.vackosar.searchbasedlauncher.entity.SingletonPersister;
 
 import java.util.ArrayList;
 import java.util.Collections;