Change application name to 'File Manager' (issue #20)

Full refactoring of package from explorer to filemanager

298 files changed, 1794 insertions, 1781 deletions

diff --git a/Android.mk b/Android.mk
index d96d2e9d..1fafe2a8 100644
--- a/Android.mk
+++ b/Android.mk
@@ -19,7 +19,7 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 
-LOCAL_PACKAGE_NAME := CMExplorer
+LOCAL_PACKAGE_NAME := CMFileManager
 LOCAL_CERTIFICATE := platform
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 LOCAL_AAPT_INCLUDE_ALL_RESOURCES := true
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 18c2aeb6..ef2f23ab 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -15,11 +15,11 @@
  ** limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="com.cyanogenmod.explorer"
+  package="com.cyanogenmod.filemanager"
   android:versionCode="100"
   android:versionName="1.0.0">
 
-  <original-package android:name="com.cyanogenmod.explorer" />
+  <original-package android:name="com.cyanogenmod.filemanager" />
 
   <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="16" />
 
@@ -29,12 +29,12 @@
   <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
 
   <application
-    android:name="ExplorerApplication"
+    android:name="FileManagerApplication"
     android:description="@string/app_description"
     android:icon="@drawable/ic_launcher"
     android:label="@string/app_name"
     android:largeHeap="true"
-    android:theme="@style/Explorer.Theme.Holo.Light" >
+    android:theme="@style/FileManager.Theme.Holo.Light" >
 
     <meta-data
       android:name="android.app.default_searchable"
@@ -42,12 +42,12 @@
 
     <provider
       android:name=".providers.RecentSearchesContentProvider"
-      android:authorities="com.cyanogenmod.explorer.providers.recentsearches"
+      android:authorities="com.cyanogenmod.filemanager.providers.recentsearches"
       android:exported="false" />
 
     <provider
       android:name=".providers.BookmarksContentProvider"
-      android:authorities="com.cyanogenmod.explorer.providers.bookmarks"
+      android:authorities="com.cyanogenmod.filemanager.providers.bookmarks"
       android:exported="false" />
 
     <activity
@@ -100,7 +100,7 @@
       android:name=".activities.PickerActivity"
       android:label="@string/picker"
       android:uiOptions="none"
-      android:theme="@style/Explorer.Theme.Holo.Light.Overlay"
+      android:theme="@style/FileManager.Theme.Holo.Light.Overlay"
       android:exported="true">
       <intent-filter>
         <action android:name="android.intent.action.GET_CONTENT" />
@@ -124,7 +124,7 @@
       android:name=".activities.ShortcutActivity"
       android:label="@string/app_name"
       android:uiOptions="none"
-      android:theme="@style/Explorer.Theme.Holo.Light.Overlay"
+      android:theme="@style/FileManager.Theme.Holo.Light.Overlay"
       android:exported="true">
       <intent-filter>
         <action android:name="android.intent.action.VIEW" />
@@ -138,8 +138,8 @@
       android:exported="false">
       <intent-filter>
         <action android:name="android.intent.action.EDIT" />
-        <category android:name="com.cyanogenmod.explorer.category.INTERNAL_VIEWER" />
-        <category android:name="com.cyanogenmod.explorer.category.EDITOR" />
+        <category android:name="com.cyanogenmod.filemanager.category.INTERNAL_VIEWER" />
+        <category android:name="com.cyanogenmod.filemanager.category.EDITOR" />
       </intent-filter>
     </activity>
 
diff --git a/res/layout/bookmarks_item.xml b/res/layout/bookmarks_item.xml
index b4e69b47..393903cf 100644
--- a/res/layout/bookmarks_item.xml
+++ b/res/layout/bookmarks_item.xml
@@ -28,7 +28,7 @@
     android:paddingLeft="@dimen/extra_margin"
     android:src="@null" />
 
-  <com.cyanogenmod.explorer.ui.widgets.NonFocusableButtonItem
+  <com.cyanogenmod.filemanager.ui.widgets.NonFocusableButtonItem
     android:id="@+id/bookmarks_item_action"
     android:layout_width="@dimen/default_buttom_width"
     android:layout_height="match_parent"
diff --git a/res/layout/breadcrumb_item.xml b/res/layout/breadcrumb_item.xml
index 9bca797b..fc33af0d 100644
--- a/res/layout/breadcrumb_item.xml
+++ b/res/layout/breadcrumb_item.xml
@@ -14,7 +14,7 @@
  ** See the License for the specific language governing permissions and
  ** limitations under the License.
 -->
-<com.cyanogenmod.explorer.ui.widgets.BreadcrumbItem
+<com.cyanogenmod.filemanager.ui.widgets.BreadcrumbItem
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:id="@+id/breadcrumb_item"
   style="@style/breadcrumb_item"
diff --git a/res/layout/breadcrumb_view.xml b/res/layout/breadcrumb_view.xml
index dc87347f..7ebdb50e 100644
--- a/res/layout/breadcrumb_view.xml
+++ b/res/layout/breadcrumb_view.xml
@@ -18,7 +18,7 @@
   android:layout_width="match_parent"
   android:layout_height="match_parent" >
 
-  <com.cyanogenmod.explorer.ui.widgets.ButtonItem
+  <com.cyanogenmod.filemanager.ui.widgets.ButtonItem
     android:id="@+id/ab_filesystem_info"
     style="@style/breadcrumb_actionbar_buttom"
     android:layout_width="wrap_content"
diff --git a/res/layout/filesystem_info_dialog.xml b/res/layout/filesystem_info_dialog.xml
index 07577f75..bb4da707 100644
--- a/res/layout/filesystem_info_dialog.xml
+++ b/res/layout/filesystem_info_dialog.xml
@@ -241,7 +241,7 @@
     android:layout_below="@id/filesystem_tabs"
     android:visibility="gone" >
 
-    <com.cyanogenmod.explorer.ui.widgets.DiskUsageGraph
+    <com.cyanogenmod.filemanager.ui.widgets.DiskUsageGraph
       android:id="@+id/filesystem_disk_usage_graph"
       android:layout_width="0dip"
       android:layout_height="wrap_content"
diff --git a/res/layout/initial_directory.xml b/res/layout/initial_directory.xml
index 66711d8e..81c67f49 100644
--- a/res/layout/initial_directory.xml
+++ b/res/layout/initial_directory.xml
@@ -29,7 +29,7 @@
     android:textAppearance="@style/primary_text_appearance"
     android:textStyle="normal" />
 
-  <com.cyanogenmod.explorer.ui.widgets.DirectoryInlineAutocompleteTextView
+  <com.cyanogenmod.filemanager.ui.widgets.DirectoryInlineAutocompleteTextView
     android:id="@+id/initial_directory_edittext"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/res/layout/inline_autocomplete.xml b/res/layout/inline_autocomplete.xml
index 172908e8..9e2e2c59 100644
--- a/res/layout/inline_autocomplete.xml
+++ b/res/layout/inline_autocomplete.xml
@@ -54,7 +54,7 @@
     <requestFocus />
   </EditText>
 
-  <com.cyanogenmod.explorer.ui.widgets.ButtonItem
+  <com.cyanogenmod.filemanager.ui.widgets.ButtonItem
     android:id="@+id/inline_autocomplete_button_tab"
     android:layout_width="@dimen/small_buttom_width"
     android:layout_height="@dimen/small_buttom_width"
diff --git a/res/layout/navigation.xml b/res/layout/navigation.xml
index 1fd18df2..97c3610c 100644
--- a/res/layout/navigation.xml
+++ b/res/layout/navigation.xml
@@ -15,21 +15,21 @@
  ** limitations under the License.
-->
 <LinearLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:cmexplorer="http://schemas.android.com/apk/res/com.cyanogenmod.explorer"
+  xmlns:filemanager="http://schemas.android.com/apk/res/com.cyanogenmod.filemanager"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
   android:orientation="vertical">
 
   <!-- Navigation View -->
-  <com.cyanogenmod.explorer.ui.widgets.NavigationView
+  <com.cyanogenmod.filemanager.ui.widgets.NavigationView
     android:id="@+id/navigation_view"
     android:layout_width="match_parent"
     android:layout_height="0dp"
     android:layout_weight="1"
-    cmexplorer:navigation="browsable" />
+    filemanager:navigation="browsable" />
 
   <!-- SelectionBar -->
-  <com.cyanogenmod.explorer.ui.widgets.SelectionView
+  <com.cyanogenmod.filemanager.ui.widgets.SelectionView
     android:id="@+id/navigation_selectionbar"
     android:layout_width="match_parent"
     android:layout_height="@dimen/small_row_height"
diff --git a/res/layout/navigation_view_customtitle.xml b/res/layout/navigation_view_customtitle.xml
index eb4f2c94..ca78aeef 100644
--- a/res/layout/navigation_view_customtitle.xml
+++ b/res/layout/navigation_view_customtitle.xml
@@ -13,7 +13,7 @@
  ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  ** See the License for the specific language governing permissions and
  ** limitations under the License.
-->
-<com.cyanogenmod.explorer.ui.widgets.NavigationCustomTitleView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.cyanogenmod.filemanager.ui.widgets.NavigationCustomTitleView xmlns:android="http://schemas.android.com/apk/res/android"
   android:id="@+id/navigation_title_flipper"
   android:layout_width="match_parent"
   android:layout_height="@dimen/default_row_height"
@@ -25,4 +25,4 @@
   <!-- The configuration layout (sort, layout, other options, ...) -->
   <include layout="@layout/navigation_view_customtitle_configuration" />
 
-</com.cyanogenmod.explorer.ui.widgets.NavigationCustomTitleView>
\ No newline at end of file
+</com.cyanogenmod.filemanager.ui.widgets.NavigationCustomTitleView>
\ No newline at end of file
diff --git a/res/layout/navigation_view_customtitle_breadcrumb.xml b/res/layout/navigation_view_customtitle_breadcrumb.xml
index 979935c2..4447606d 100644
--- a/res/layout/navigation_view_customtitle_breadcrumb.xml
+++ b/res/layout/navigation_view_customtitle_breadcrumb.xml
@@ -18,7 +18,7 @@
   android:layout_width="match_parent"
   android:layout_height="match_parent" >
 
-  <com.cyanogenmod.explorer.ui.widgets.ButtonItem
+  <com.cyanogenmod.filemanager.ui.widgets.ButtonItem
     android:id="@+id/ab_configuration"
     style="@style/breadcrumb_actionbar_buttom"
     android:layout_width="wrap_content"
@@ -28,7 +28,7 @@
     android:onClick="onActionBarItemClick"
     android:src="@drawable/ic_holo_light_previous" />
 
-  <com.cyanogenmod.explorer.ui.widgets.BreadcrumbView
+  <com.cyanogenmod.filemanager.ui.widgets.BreadcrumbView
     android:id="@+id/breadcrumb_view"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/res/layout/navigation_view_customtitle_configuration.xml b/res/layout/navigation_view_customtitle_configuration.xml
index 9e5e3a93..6c9f1a18 100644
--- a/res/layout/navigation_view_customtitle_configuration.xml
+++ b/res/layout/navigation_view_customtitle_configuration.xml
@@ -27,7 +27,7 @@
     android:gravity="center_horizontal"
     android:orientation="horizontal" >
 
-    <com.cyanogenmod.explorer.ui.widgets.ButtonItem
+    <com.cyanogenmod.filemanager.ui.widgets.ButtonItem
       android:id="@+id/ab_sort_mode"
       android:layout_width="@dimen/default_buttom_width"
       android:layout_height="match_parent"
@@ -35,7 +35,7 @@
       android:onClick="onActionBarItemClick"
       android:src="@drawable/ic_holo_light_sort_alphabetically" />
 
-    <com.cyanogenmod.explorer.ui.widgets.ButtonItem
+    <com.cyanogenmod.filemanager.ui.widgets.ButtonItem
       android:id="@+id/ab_layout_mode"
       android:layout_width="@dimen/default_buttom_width"
       android:layout_height="match_parent"
@@ -43,7 +43,7 @@
       android:onClick="onActionBarItemClick"
       android:src="@drawable/ic_holo_light_layout" />
 
-    <com.cyanogenmod.explorer.ui.widgets.ButtonItem
+    <com.cyanogenmod.filemanager.ui.widgets.ButtonItem
       android:id="@+id/ab_view_options"
       android:layout_width="@dimen/default_buttom_width"
       android:layout_height="match_parent"
@@ -52,7 +52,7 @@
       android:src="@drawable/ic_holo_light_view" />
   </LinearLayout>
 
-  <com.cyanogenmod.explorer.ui.widgets.ButtonItem
+  <com.cyanogenmod.filemanager.ui.widgets.ButtonItem
     android:id="@+id/ab_close"
     android:layout_width="@dimen/default_buttom_width"
     android:layout_height="match_parent"
diff --git a/res/layout/navigation_view_details_item.xml b/res/layout/navigation_view_details_item.xml
index f85b286a..29975205 100644
--- a/res/layout/navigation_view_details_item.xml
+++ b/res/layout/navigation_view_details_item.xml
@@ -19,7 +19,7 @@
   android:layout_height="@dimen/default_row_height"
   android:background="@drawable/holo_list_selector_deseleted" >
 
-  <com.cyanogenmod.explorer.ui.widgets.TransparentNonFocusableButtonItem
+  <com.cyanogenmod.filemanager.ui.widgets.TransparentNonFocusableButtonItem
     android:id="@+id/navigation_view_item_check"
     android:layout_width="@dimen/item_menu_row_button_width"
     android:layout_height="match_parent"
@@ -37,7 +37,7 @@
     android:contentDescription="@null"
     android:src="@null" />
 
-  <com.cyanogenmod.explorer.ui.widgets.NonFocusableButtonItem
+  <com.cyanogenmod.filemanager.ui.widgets.NonFocusableButtonItem
     android:id="@+id/navigation_view_item_menu"
     android:layout_width="@dimen/item_menu_row_button_width"
     android:layout_height="match_parent"
diff --git a/res/layout/navigation_view_icons_item.xml b/res/layout/navigation_view_icons_item.xml
index 997412cc..422e4da0 100644
--- a/res/layout/navigation_view_icons_item.xml
+++ b/res/layout/navigation_view_icons_item.xml
@@ -18,7 +18,7 @@
   android:layout_width="@dimen/navigation_grid_width"
   android:layout_height="@dimen/navigation_grid_height" >
 
-  <com.cyanogenmod.explorer.ui.widgets.TransparentNonFocusableButtonItem
+  <com.cyanogenmod.filemanager.ui.widgets.TransparentNonFocusableButtonItem
     android:id="@+id/navigation_view_item_check"
     android:layout_width="@dimen/navigation_grid_item_width"
     android:layout_height="@dimen/navigation_grid_item_height"
@@ -36,7 +36,7 @@
     android:gravity="center|center_vertical"
     android:src="@null" />
 
-<!--   <com.cyanogenmod.explorer.ui.widgets.NonFocusableButtonItem -->
+<!--   <com.cyanogenmod.filemanager.ui.widgets.NonFocusableButtonItem -->
 <!--     android:id="@+id/navigation_view_item_menu" -->
 <!--     android:layout_width="@dimen/navigation_grid_item_width" -->
 <!--     android:layout_height="@dimen/navigation_grid_item_height" -->
diff --git a/res/layout/navigation_view_selectionbar.xml b/res/layout/navigation_view_selectionbar.xml
index 2874df09..96b31fe5 100644
--- a/res/layout/navigation_view_selectionbar.xml
+++ b/res/layout/navigation_view_selectionbar.xml
@@ -20,7 +20,7 @@
   android:background="@drawable/bg_holo_selectionbar"
   android:orientation="horizontal" >
 
-  <com.cyanogenmod.explorer.ui.widgets.ButtonItem
+  <com.cyanogenmod.filemanager.ui.widgets.ButtonItem
     android:id="@+id/ab_selection_done"
     android:layout_width="@dimen/small_buttom_width"
     android:layout_height="@dimen/small_buttom_width"
diff --git a/res/layout/navigation_view_simple_item.xml b/res/layout/navigation_view_simple_item.xml
index 364e9632..79fa5913 100644
--- a/res/layout/navigation_view_simple_item.xml
+++ b/res/layout/navigation_view_simple_item.xml
@@ -19,7 +19,7 @@
   android:layout_height="@dimen/default_row_height"
   android:background="@drawable/holo_list_selector_deseleted" >
 
-  <com.cyanogenmod.explorer.ui.widgets.TransparentNonFocusableButtonItem
+  <com.cyanogenmod.filemanager.ui.widgets.TransparentNonFocusableButtonItem
     android:id="@+id/navigation_view_item_check"
     android:layout_width="@dimen/item_menu_row_button_width"
     android:layout_height="match_parent"
@@ -37,7 +37,7 @@
     android:contentDescription="@null"
     android:src="@null" />
 
-  <com.cyanogenmod.explorer.ui.widgets.NonFocusableButtonItem
+  <com.cyanogenmod.filemanager.ui.widgets.NonFocusableButtonItem
     android:id="@+id/navigation_view_item_menu"
     android:layout_width="@dimen/item_menu_row_button_width"
     android:layout_height="match_parent"
diff --git a/res/layout/navigation_view_statusbar.xml b/res/layout/navigation_view_statusbar.xml
index 02b49e8b..d10cec00 100644
--- a/res/layout/navigation_view_statusbar.xml
+++ b/res/layout/navigation_view_statusbar.xml
@@ -19,7 +19,7 @@
   android:layout_height="@dimen/default_row_height"
   android:background="@drawable/bg_holo_statusbar" >
 
-  <com.cyanogenmod.explorer.ui.widgets.ButtonItem
+  <com.cyanogenmod.filemanager.ui.widgets.ButtonItem
       android:id="@+id/ab_overflow"
       android:layout_width="@dimen/default_buttom_width"
       android:layout_height="match_parent"
@@ -28,7 +28,7 @@
       android:onClick="onActionBarItemClick"
       android:src="@drawable/ic_holo_light_overflow" />
 
-  <com.cyanogenmod.explorer.ui.widgets.ButtonItem
+  <com.cyanogenmod.filemanager.ui.widgets.ButtonItem
     android:id="@+id/ab_actions"
     android:layout_width="@dimen/default_buttom_width"
     android:layout_height="match_parent"
@@ -43,7 +43,7 @@
     android:layout_toLeftOf="@id/ab_overflow"
     android:layout_toRightOf="@id/ab_actions">
 
-    <com.cyanogenmod.explorer.ui.widgets.ButtonItem
+    <com.cyanogenmod.filemanager.ui.widgets.ButtonItem
       android:id="@+id/ab_search"
       android:layout_width="@dimen/default_buttom_width"
       android:layout_height="match_parent"
@@ -53,7 +53,7 @@
       android:src="@drawable/ic_holo_light_search"
       android:visibility="invisible" />
 
-    <com.cyanogenmod.explorer.ui.widgets.ButtonItem
+    <com.cyanogenmod.filemanager.ui.widgets.ButtonItem
       android:id="@+id/ab_bookmarks"
       android:layout_width="@dimen/default_buttom_width"
       android:layout_height="match_parent"
@@ -63,7 +63,7 @@
       android:src="@drawable/ic_holo_light_bookmarks"
       android:visibility="invisible" />
 
-    <com.cyanogenmod.explorer.ui.widgets.ButtonItem
+    <com.cyanogenmod.filemanager.ui.widgets.ButtonItem
       android:id="@+id/ab_history"
       android:layout_width="@dimen/default_buttom_width"
       android:layout_height="match_parent"
diff --git a/res/layout/picker.xml b/res/layout/picker.xml
index 97a64102..39e145a0 100644
--- a/res/layout/picker.xml
+++ b/res/layout/picker.xml
@@ -15,14 +15,14 @@
  ** limitations under the License.
-->
 <LinearLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:cmexplorer="http://schemas.android.com/apk/res/com.cyanogenmod.explorer"
+  xmlns:filemanager="http://schemas.android.com/apk/res/com.cyanogenmod.filemanager"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
   android:background="@color/default_background"
   android:orientation="vertical">
 
   <!-- Breadcrumb -->
-  <com.cyanogenmod.explorer.ui.widgets.BreadcrumbView
+  <com.cyanogenmod.filemanager.ui.widgets.BreadcrumbView
     android:id="@+id/breadcrumb_view"
     android:layout_width="match_parent"
     android:layout_height="@dimen/default_row_height"
@@ -32,13 +32,13 @@
   <include layout="@layout/vertical_divider" />
 
   <!-- Picker Navigation View -->
-  <com.cyanogenmod.explorer.ui.widgets.NavigationView
+  <com.cyanogenmod.filemanager.ui.widgets.NavigationView
     android:id="@+id/navigation_view"
     android:layout_width="match_parent"
     android:layout_height="0dp"
     android:layout_weight="1"
     android:layout_marginLeft="@dimen/extra_margin"
     android:layout_marginRight="@dimen/extra_margin"
-    cmexplorer:navigation="pickable" />
+    filemanager:navigation="pickable" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/search_item.xml b/res/layout/search_item.xml
index 8d3364e7..6b6ae5b8 100644
--- a/res/layout/search_item.xml
+++ b/res/layout/search_item.xml
@@ -27,7 +27,7 @@
     android:contentDescription="@null"
     android:src="@null" />
 
-  <com.cyanogenmod.explorer.ui.widgets.NonFocusableButtonItem
+  <com.cyanogenmod.filemanager.ui.widgets.NonFocusableButtonItem
     android:id="@+id/search_item_menu"
     android:layout_width="@dimen/item_menu_row_button_width"
     android:layout_height="match_parent"
@@ -61,7 +61,7 @@
       android:layout_marginLeft="@dimen/default_margin"
       android:orientation="horizontal" >
 
-      <com.cyanogenmod.explorer.ui.widgets.RelevanceView
+      <com.cyanogenmod.filemanager.ui.widgets.RelevanceView
         android:id="@+id/search_item_relevance"
         android:layout_width="@dimen/relevance_item_width"
         android:layout_height="@dimen/relevance_item_height"
diff --git a/res/layout/simple_customtitle.xml b/res/layout/simple_customtitle.xml
index 5ac5b5a0..76ce9e72 100644
--- a/res/layout/simple_customtitle.xml
+++ b/res/layout/simple_customtitle.xml
@@ -17,7 +17,7 @@
   android:layout_width="match_parent"
   android:layout_height="match_parent" >
 
-  <com.cyanogenmod.explorer.ui.widgets.ButtonItem
+  <com.cyanogenmod.filemanager.ui.widgets.ButtonItem
     android:id="@+id/ab_button1"
     style="@style/breadcrumb_actionbar_buttom"
     android:layout_width="wrap_content"
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 97366f68..f495cdc1 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -16,7 +16,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
   <!-- The strings of the menu for navigation sort mode enumeration -->
-  <string-array name="cm_explorer_sort_mode" translable="false">
+  <string-array name="cm_filemanager_sort_mode" translable="false">
     <item>@string/sort_by_name_asc</item>
     <item>@string/sort_by_name_desc</item>
     <item>@string/sort_by_date_asc</item>
@@ -24,7 +24,7 @@
   </string-array>
 
   <!-- The strings of the menu for navigation layout mode enumeration -->
-  <string-array name="cm_explorer_layout_mode" translable="false">
+  <string-array name="cm_filemanager_layout_mode" translable="false">
     <item>@string/layout_icons</item>
     <item>@string/layout_simple</item>
     <item>@string/layout_details</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 309d0e65..d1883e27 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -17,9 +17,9 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
   <!-- The name of the application -->
-  <string name="app_name">CMExplorer</string>
+  <string name="app_name">File Manager</string>
   <!-- The description of the application -->
-  <string name="app_description">CyanogenMod file manager.</string>
+  <string name="app_description">A CyanogenMod file manager.</string>
 
   <!-- Human readable sizes -->
   <string name="size_bytes" translatable="false">B </string>
@@ -195,13 +195,13 @@
   <string name="layout_details">Details</string>
 
   <!-- Navigation View * View * Show folders first -->
-  <string name="cm_explorer_show_dirs_first">Show folders first</string>
+  <string name="cm_filemanager_show_dirs_first">Show folders first</string>
   <!-- Navigation View * View * Show hidden files option -->
-  <string name="cm_explorer_show_hidden">Show hidden files</string>
+  <string name="cm_filemanager_show_hidden">Show hidden files</string>
   <!-- Navigation View * View * Show system files option -->
-  <string name="cm_explorer_show_system">Show system files</string>
+  <string name="cm_filemanager_show_system">Show system files</string>
   <!-- Navigation View * View * Show symlinks option -->
-  <string name="cm_explorer_show_symlinks">Show symlinks</string>
+  <string name="cm_filemanager_show_symlinks">Show symlinks</string>
 
   <!-- Filesystem Info (no data) -->
   <string name="filesystem_info_warning_msg">There is no information available for the file system.</string>
@@ -615,7 +615,7 @@
   <!-- Preferences * About title -->
   <string name="pref_about">About</string>
   <!-- Preferences * About summary -->
-  <string name="pref_about_summary">CM Explorer v<xliff:g id="version">%1$s</xliff:g>
+  <string name="pref_about_summary">File Manager v<xliff:g id="version">%1$s</xliff:g>
     \nCopyright \u00A9 2012 The CyanogenMod Project</string>
 
   <!-- Preferences * General * Behaviour category -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 97cd8a1b..503e9e65 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -17,12 +17,12 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
   <!-- The default theme -->
-  <style name="Explorer.Theme.Holo.Light" parent="@android:style/Theme.Holo.Light">
+  <style name="FileManager.Theme.Holo.Light" parent="@android:style/Theme.Holo.Light">
     <item name="android:windowBackground">@color/default_background</item>
   </style>
 
   <!-- A theme with overlay -->
-  <style name="Explorer.Theme.Holo.Light.Overlay" parent="@android:style/Theme.Holo.Light">
+  <style name="FileManager.Theme.Holo.Light.Overlay" parent="@android:style/Theme.Holo.Light">
     <item name="android:windowIsTranslucent">true</item>
     <item name="android:windowBackground">@color/black_transparent</item>
     <item name="android:windowContentOverlay">@null</item>
diff --git a/res/xml/command_list.xml b/res/xml/command_list.xml
index 00b012e8..1d3b23c2 100644
--- a/res/xml/command_list.xml
+++ b/res/xml/command_list.xml
@@ -30,7 +30,7 @@
   configure special values for each device. Use overlay building folder on device tree
   for overlay this values
 -->
-<CommandList xmlns="http://schemas.android.com/apk/res/com.cyanogenmod.explorer">
+<CommandList xmlns="http://schemas.android.com/apk/res/com.cyanogenmod.filemanager">
   <!-- Start code (append to commands; for retrieve the exit code) -->
   <startcode commandId="startcode" commandPath="/system/xbin/echo %1$s0%2$s ; " />
   <!-- Exit code (append to commands; for retrieve the exit code) -->
diff --git a/res/xml/filesystem_bookmarks.xml b/res/xml/filesystem_bookmarks.xml
index 4f2afa41..20da80e3 100644
--- a/res/xml/filesystem_bookmarks.xml
+++ b/res/xml/filesystem_bookmarks.xml
@@ -22,7 +22,7 @@
         name:   (string) The name of the bookmark
         directory:   (string) The folder where to point to
 -->
-<Bookmarks xmlns="http://schemas.android.com/apk/res/com.cyanogenmod.explorer">
+<Bookmarks xmlns="http://schemas.android.com/apk/res/com.cyanogenmod.filemanager">
   <bookmark name="@string/bookmarks_root_folder" directory="@string/root_dir" />
   <bookmark name="@string/bookmarks_system_folder" directory="@string/system_dir" />
 </Bookmarks>
\ No newline at end of file
diff --git a/res/xml/preferences_general.xml b/res/xml/preferences_general.xml
index 7a1be3ce..615a85a9 100644
--- a/res/xml/preferences_general.xml
+++ b/res/xml/preferences_general.xml
@@ -24,14 +24,14 @@
 
       <!-- Case sensitive order -->
       <CheckBoxPreference
-        android:key="cm_explorer_case_sensitive_sort"
+        android:key="cm_filemanager_case_sensitive_sort"
         android:title="@string/pref_case_sensitive_sort"
         android:persistent="true"
         android:defaultValue="false" />
 
       <!-- Default longclick action -->
       <ListPreference
-        android:key="cm_explorer_default_longclick_action"
+        android:key="cm_filemanager_default_longclick_action"
         android:title="@string/pref_default_longclick_action"
         android:entries="@array/default_longclick_action_labels"
         android:entryValues="@array/default_longclick_action_values"
@@ -40,7 +40,7 @@
 
       <!-- Disk usage warning level -->
       <ListPreference
-        android:key="cm_explorer_disk_usage_warning_level"
+        android:key="cm_filemanager_disk_usage_warning_level"
         android:title="@string/pref_disk_usage_warning_level"
         android:entries="@array/disk_usage_warning_level_labels"
         android:entryValues="@array/disk_usage_warning_level_values"
@@ -49,7 +49,7 @@
 
       <!-- Compute folder statistics -->
       <CheckBoxPreference
-        android:key="cm_explorer_compute_folder_statistics"
+        android:key="cm_filemanager_compute_folder_statistics"
         android:title="@string/pref_compute_folder_statistics"
         android:summaryOn="@string/pref_compute_folder_statistics_on"
         android:persistent="true"
@@ -64,7 +64,7 @@
 
       <!-- Advanced mode -->
       <CheckBoxPreference
-        android:key="cm_explorer_advanced_mode"
+        android:key="cm_filemanager_advanced_mode"
         android:title="@string/pref_advanced_mode"
         android:summaryOn="@string/pref_advanced_mode_on"
         android:persistent="true"
@@ -72,7 +72,7 @@
 
       <!-- Capture debug traces -->
       <CheckBoxPreference
-        android:key="cm_explorer_show_debug_traces"
+        android:key="cm_filemanager_show_debug_traces"
         android:title="@string/pref_debug_traces"
         android:persistent="true"
         android:defaultValue="false" />
diff --git a/res/xml/preferences_headers.xml b/res/xml/preferences_headers.xml
index dd60e2e1..c4127109 100644
--- a/res/xml/preferences_headers.xml
+++ b/res/xml/preferences_headers.xml
@@ -16,10 +16,10 @@
 -->
 <preference-headers xmlns:android="http://schemas.android.com/apk/res/android">
     <header
-      android:fragment="com.cyanogenmod.explorer.activities.preferences.SettingsPreferences$GeneralPreferenceFragment"
+      android:fragment="com.cyanogenmod.filemanager.activities.preferences.SettingsPreferences$GeneralPreferenceFragment"
       android:title="@string/pref_general" />
     <header
-      android:fragment="com.cyanogenmod.explorer.activities.preferences.SettingsPreferences$SearchPreferenceFragment"
+      android:fragment="com.cyanogenmod.filemanager.activities.preferences.SettingsPreferences$SearchPreferenceFragment"
       android:title="@string/pref_search" />
     <header
       android:title="@string/pref_about"
diff --git a/res/xml/preferences_search.xml b/res/xml/preferences_search.xml
index 29b8cfce..9f87311e 100644
--- a/res/xml/preferences_search.xml
+++ b/res/xml/preferences_search.xml
@@ -24,21 +24,21 @@
 
       <!-- Highlight search terms -->
       <CheckBoxPreference
-        android:key="cm_explorer_highlight_terms"
+        android:key="cm_filemanager_highlight_terms"
         android:title="@string/pref_highlight_terms"
         android:persistent="true"
         android:defaultValue="true" />
 
       <!-- Relevance widget -->
       <CheckBoxPreference
-        android:key="cm_explorer_show_relevance_widget"
+        android:key="cm_filemanager_show_relevance_widget"
         android:title="@string/pref_show_relevance_widget"
         android:persistent="true"
         android:defaultValue="true" />
 
       <!-- Sort results mode -->
       <ListPreference
-        android:key="cm_explorer_sort_search_results_mode"
+        android:key="cm_filemanager_sort_search_results_mode"
         android:title="@string/pref_sort_search_results_mode"
         android:entries="@array/sort_search_results_mode_labels"
         android:entryValues="@array/sort_search_results_mode_values"
@@ -54,7 +54,7 @@
 
       <!-- Save search terms -->
       <CheckBoxPreference
-        android:key="cm_explorer_save_search_terms"
+        android:key="cm_filemanager_save_search_terms"
         android:title="@string/pref_save_search_terms"
         android:summaryOn="@string/pref_save_search_terms_on"
         android:summaryOff="@string/pref_save_search_terms_off"
@@ -63,10 +63,10 @@
 
       <!-- Remove saved search terms -->
       <Preference
-        android:key="cm_explorer_remove_saved_search_terms"
+        android:key="cm_filemanager_remove_saved_search_terms"
         android:title="@string/pref_remove_saved_search_terms"
         android:summary="@string/pref_remove_saved_search_terms_summary"
-        android:dependency="cm_explorer_save_search_terms" />
+        android:dependency="cm_filemanager_save_search_terms" />
     </PreferenceCategory>
 
 </PreferenceScreen>  
\ No newline at end of file
diff --git a/res/xml/searchable.xml b/res/xml/searchable.xml
index 42e2c408..b6bad911 100644
--- a/res/xml/searchable.xml
+++ b/res/xml/searchable.xml
@@ -19,7 +19,7 @@
   android:imeOptions="actionSearch"
   android:includeInGlobalSearch="false"
   android:label="@string/search"
-  android:searchSuggestAuthority="com.cyanogenmod.explorer.providers.recentsearches"
+  android:searchSuggestAuthority="com.cyanogenmod.filemanager.providers.recentsearches"
   android:searchSuggestSelection=" ?"
   android:searchSuggestThreshold="3"
   android:voiceMaxResults="5"
diff --git a/src/com/cyanogenmod/explorer/ExplorerApplication.java b/src/com/cyanogenmod/filemanager/FileManagerApplication.java
index 651a2304..7b80bbea 100644
--- a/src/com/cyanogenmod/explorer/ExplorerApplication.java
+++ b/src/com/cyanogenmod/filemanager/FileManagerApplication.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer;
+package com.cyanogenmod.filemanager;
 
 import android.app.Application;
 import android.content.BroadcastReceiver;
@@ -25,16 +25,16 @@ import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.util.Log;
 
-import com.cyanogenmod.explorer.console.Console;
-import com.cyanogenmod.explorer.console.ConsoleAllocException;
-import com.cyanogenmod.explorer.console.ConsoleBuilder;
-import com.cyanogenmod.explorer.console.ConsoleHolder;
-import com.cyanogenmod.explorer.console.shell.PrivilegedConsole;
-import com.cyanogenmod.explorer.preferences.ExplorerSettings;
-import com.cyanogenmod.explorer.preferences.Preferences;
-import com.cyanogenmod.explorer.util.ExceptionUtil;
-import com.cyanogenmod.explorer.util.FileHelper;
-import com.cyanogenmod.explorer.util.MimeTypeHelper;
+import com.cyanogenmod.filemanager.console.Console;
+import com.cyanogenmod.filemanager.console.ConsoleAllocException;
+import com.cyanogenmod.filemanager.console.ConsoleBuilder;
+import com.cyanogenmod.filemanager.console.ConsoleHolder;
+import com.cyanogenmod.filemanager.console.shell.PrivilegedConsole;
+import com.cyanogenmod.filemanager.preferences.FileManagerSettings;
+import com.cyanogenmod.filemanager.preferences.Preferences;
+import com.cyanogenmod.filemanager.util.ExceptionUtil;
+import com.cyanogenmod.filemanager.util.FileHelper;
+import com.cyanogenmod.filemanager.util.MimeTypeHelper;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -45,9 +45,9 @@ import java.util.Properties;
  * identifiers, statics variables, ...).
  * @hide
  */
-public final class ExplorerApplication extends Application {
+public final class FileManagerApplication extends Application {
 
-    private static final String TAG = "ExplorerApplication"; //$NON-NLS-1$
+    private static final String TAG = "FileManagerApplication"; //$NON-NLS-1$
 
     private static boolean DEBUG = false;
     private static Properties sSystemProperties;
@@ -56,10 +56,10 @@ public final class ExplorerApplication extends Application {
      * A constant that contains the main process name.
      * @hide
      */
-    public static final String MAIN_PROCESS = "com.cyanogenmod.explorer"; //$NON-NLS-1$
+    public static final String MAIN_PROCESS = "com.cyanogenmod.filemanager"; //$NON-NLS-1$
 
     //Static resources
-    private static ExplorerApplication sApp;
+    private static FileManagerApplication sApp;
     private static ConsoleHolder sBackgroundConsole;
 
     private static boolean sIsDebuggable = false;
@@ -69,12 +69,12 @@ public final class ExplorerApplication extends Application {
         @Override
         public void onReceive(Context context, Intent intent) {
             if (intent != null &&
-                intent.getAction().compareTo(ExplorerSettings.INTENT_SETTING_CHANGED) == 0) {
+                intent.getAction().compareTo(FileManagerSettings.INTENT_SETTING_CHANGED) == 0) {
 
                 // The settings has changed
-                String key = intent.getStringExtra(ExplorerSettings.EXTRA_SETTING_CHANGED_KEY);
+                String key = intent.getStringExtra(FileManagerSettings.EXTRA_SETTING_CHANGED_KEY);
                 if (key != null &&
-                    key.compareTo(ExplorerSettings.SETTINGS_SHOW_TRACES.getId()) == 0) {
+                    key.compareTo(FileManagerSettings.SETTINGS_SHOW_TRACES.getId()) == 0) {
 
                     // The debug traces setting has changed. Notify to consoles
                     Console c = null;
@@ -91,7 +91,7 @@ public final class ExplorerApplication extends Application {
                         }
                     } catch (Throwable _throw) {/**NON BLOCK**/}
                 } else if (key != null && key.compareTo(
-                        ExplorerSettings.SETTINGS_ADVANCE_MODE.getId()) == 0) {
+                        FileManagerSettings.SETTINGS_ADVANCE_MODE.getId()) == 0) {
                     // Force to change to a privileged console.
                     boolean advancedMode = isAdvancedMode();
                     if (!advancedMode) {
@@ -101,7 +101,7 @@ public final class ExplorerApplication extends Application {
                             ConsoleBuilder.changeToPrivilegedConsole(context);
                             try {
                                 Preferences.savePreference(
-                                        ExplorerSettings.SETTINGS_SUPERUSER_MODE,
+                                        FileManagerSettings.SETTINGS_SUPERUSER_MODE,
                                         Boolean.TRUE, true);
                             } catch (Throwable ex) {
                                 Log.w(TAG, "can't save console preference", ex); //$NON-NLS-1$
@@ -109,7 +109,7 @@ public final class ExplorerApplication extends Application {
                         } else {
                             try {
                                 Preferences.savePreference(
-                                        ExplorerSettings.SETTINGS_SUPERUSER_MODE,
+                                        FileManagerSettings.SETTINGS_SUPERUSER_MODE,
                                         Boolean.FALSE, true);
                             } catch (Throwable ex) {
                                 Log.w(TAG, "can't save console preference", ex); //$NON-NLS-1$
@@ -129,7 +129,7 @@ public final class ExplorerApplication extends Application {
     @Override
     public void onCreate() {
         if (DEBUG) {
-            Log.d(TAG, "ExplorerApplication.onCreate"); //$NON-NLS-1$
+            Log.d(TAG, "FileManagerApplication.onCreate"); //$NON-NLS-1$
         }
         register();
         init();
@@ -182,7 +182,7 @@ public final class ExplorerApplication extends Application {
 
         // Register the broadcast receiver
         IntentFilter filter = new IntentFilter();
-        filter.addAction(ExplorerSettings.INTENT_SETTING_CHANGED);
+        filter.addAction(FileManagerSettings.INTENT_SETTING_CHANGED);
         registerReceiver(this.mOnSettingChangeReceiver, filter);
     }
 
@@ -211,7 +211,7 @@ public final class ExplorerApplication extends Application {
      * @return Application The application singleton reference
      * @hide
      */
-    public static ExplorerApplication getInstance() {
+    public static FileManagerApplication getInstance() {
         return sApp;
     }
 
@@ -363,10 +363,10 @@ public final class ExplorerApplication extends Application {
      */
     public static boolean isSuperuserMode() {
         boolean defaultValue =
-                ((Boolean)ExplorerSettings.
+                ((Boolean)FileManagerSettings.
                         SETTINGS_SUPERUSER_MODE.
                             getDefaultValue()).booleanValue();
-       String id = ExplorerSettings.SETTINGS_SUPERUSER_MODE.getId();
+       String id = FileManagerSettings.SETTINGS_SUPERUSER_MODE.getId();
        return Preferences.getSharedPreferences().getBoolean(id, defaultValue);
     }
 
@@ -380,10 +380,10 @@ public final class ExplorerApplication extends Application {
         if (!isDeviceRooted()) return false;
 
         boolean defaultValue =
-                ((Boolean)ExplorerSettings.
+                ((Boolean)FileManagerSettings.
                         SETTINGS_ADVANCE_MODE.
                             getDefaultValue()).booleanValue();
-        String id = ExplorerSettings.SETTINGS_ADVANCE_MODE.getId();
+        String id = FileManagerSettings.SETTINGS_ADVANCE_MODE.getId();
         return Preferences.getSharedPreferences().getBoolean(id, defaultValue);
     }
 
diff --git a/src/com/cyanogenmod/explorer/activities/BookmarksActivity.java b/src/com/cyanogenmod/filemanager/activities/BookmarksActivity.java
index 8ce18011..6f5f6edc 100644
--- a/src/com/cyanogenmod/explorer/activities/BookmarksActivity.java
+++ b/src/com/cyanogenmod/filemanager/activities/BookmarksActivity.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.activities;
+package com.cyanogenmod.filemanager.activities;
 
 import android.app.ActionBar;
 import android.app.Activity;
@@ -36,21 +36,21 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import com.android.internal.util.XmlUtils;
-import com.cyanogenmod.explorer.ExplorerApplication;
-import com.cyanogenmod.explorer.R;
-import com.cyanogenmod.explorer.adapters.BookmarksAdapter;
-import com.cyanogenmod.explorer.console.NoSuchFileOrDirectory;
-import com.cyanogenmod.explorer.model.Bookmark;
-import com.cyanogenmod.explorer.model.Bookmark.BOOKMARK_TYPE;
-import com.cyanogenmod.explorer.model.FileSystemObject;
-import com.cyanogenmod.explorer.preferences.Bookmarks;
-import com.cyanogenmod.explorer.preferences.ExplorerSettings;
-import com.cyanogenmod.explorer.preferences.Preferences;
-import com.cyanogenmod.explorer.ui.dialogs.InitialDirectoryDialog;
-import com.cyanogenmod.explorer.util.CommandHelper;
-import com.cyanogenmod.explorer.util.DialogHelper;
-import com.cyanogenmod.explorer.util.ExceptionUtil;
-import com.cyanogenmod.explorer.util.StorageHelper;
+import com.cyanogenmod.filemanager.FileManagerApplication;
+import com.cyanogenmod.filemanager.R;
+import com.cyanogenmod.filemanager.adapters.BookmarksAdapter;
+import com.cyanogenmod.filemanager.console.NoSuchFileOrDirectory;
+import com.cyanogenmod.filemanager.model.Bookmark;
+import com.cyanogenmod.filemanager.model.Bookmark.BOOKMARK_TYPE;
+import com.cyanogenmod.filemanager.model.FileSystemObject;
+import com.cyanogenmod.filemanager.preferences.Bookmarks;
+import com.cyanogenmod.filemanager.preferences.FileManagerSettings;
+import com.cyanogenmod.filemanager.preferences.Preferences;
+import com.cyanogenmod.filemanager.ui.dialogs.InitialDirectoryDialog;
+import com.cyanogenmod.filemanager.util.CommandHelper;
+import com.cyanogenmod.filemanager.util.DialogHelper;
+import com.cyanogenmod.filemanager.util.ExceptionUtil;
+import com.cyanogenmod.filemanager.util.StorageHelper;
 
 import java.io.FileNotFoundException;
 import java.util.ArrayList;
@@ -83,7 +83,7 @@ public class BookmarksActivity extends Activity implements OnItemClickListener,
         }
 
         // Is ChRooted?
-        this.mChRooted = !ExplorerApplication.isAdvancedMode();
+        this.mChRooted = !FileManagerApplication.isAdvancedMode();
 
         //Request features
         setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
@@ -292,8 +292,8 @@ public class BookmarksActivity extends Activity implements OnItemClickListener,
      */
     private Bookmark loadHomeBookmarks() {
         String initialDir = Preferences.getSharedPreferences().getString(
-                                ExplorerSettings.SETTINGS_INITIAL_DIR.getId(),
-                                (String)ExplorerSettings.SETTINGS_INITIAL_DIR.getDefaultValue());
+                                FileManagerSettings.SETTINGS_INITIAL_DIR.getId(),
+                                (String)FileManagerSettings.SETTINGS_INITIAL_DIR.getDefaultValue());
         return new Bookmark(BOOKMARK_TYPE.HOME, getString(R.string.bookmarks_home), initialDir);
     }
 
diff --git a/src/com/cyanogenmod/explorer/activities/EditorActivity.java b/src/com/cyanogenmod/filemanager/activities/EditorActivity.java
index 44f43ea1..ebe7fb2c 100644
--- a/src/com/cyanogenmod/explorer/activities/EditorActivity.java
+++ b/src/com/cyanogenmod/filemanager/activities/EditorActivity.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.activities;
+package com.cyanogenmod.filemanager.activities;
 
 import android.app.ActionBar;
 import android.app.Activity;
@@ -38,16 +38,16 @@ import android.widget.TextView;
 import android.widget.TextView.BufferType;
 import android.widget.Toast;
 
-import com.cyanogenmod.explorer.R;
-import com.cyanogenmod.explorer.commands.AsyncResultListener;
-import com.cyanogenmod.explorer.commands.WriteExecutable;
-import com.cyanogenmod.explorer.console.ConsoleBuilder;
-import com.cyanogenmod.explorer.model.FileSystemObject;
-import com.cyanogenmod.explorer.preferences.ExplorerSettings;
-import com.cyanogenmod.explorer.ui.widgets.ButtonItem;
-import com.cyanogenmod.explorer.util.CommandHelper;
-import com.cyanogenmod.explorer.util.DialogHelper;
-import com.cyanogenmod.explorer.util.ExceptionUtil;
+import com.cyanogenmod.filemanager.R;
+import com.cyanogenmod.filemanager.commands.AsyncResultListener;
+import com.cyanogenmod.filemanager.commands.WriteExecutable;
+import com.cyanogenmod.filemanager.console.ConsoleBuilder;
+import com.cyanogenmod.filemanager.model.FileSystemObject;
+import com.cyanogenmod.filemanager.preferences.FileManagerSettings;
+import com.cyanogenmod.filemanager.ui.widgets.ButtonItem;
+import com.cyanogenmod.filemanager.util.CommandHelper;
+import com.cyanogenmod.filemanager.util.DialogHelper;
+import com.cyanogenmod.filemanager.util.ExceptionUtil;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
@@ -595,9 +595,9 @@ public class EditorActivity extends Activity implements TextWatcher {
                 setDirty(false);
 
                 // Send a message that allow other activities to update his data
-                Intent intent = new Intent(ExplorerSettings.INTENT_FILE_CHANGED);
+                Intent intent = new Intent(FileManagerSettings.INTENT_FILE_CHANGED);
                 intent.putExtra(
-                        ExplorerSettings.EXTRA_FILE_CHANGED_KEY, this.mFso.getFullPath());
+                        FileManagerSettings.EXTRA_FILE_CHANGED_KEY, this.mFso.getFullPath());
                 sendBroadcast(intent);
             }
 
diff --git a/src/com/cyanogenmod/explorer/activities/HistoryActivity.java b/src/com/cyanogenmod/filemanager/activities/HistoryActivity.java
index 1074868e..186e6dd6 100644
--- a/src/com/cyanogenmod/explorer/activities/HistoryActivity.java
+++ b/src/com/cyanogenmod/filemanager/activities/HistoryActivity.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.activities;
+package com.cyanogenmod.filemanager.activities;
 
 import android.app.ActionBar;
 import android.app.Activity;
@@ -31,13 +31,13 @@ import android.widget.ListPopupWindow;
 import android.widget.ListView;
 import android.widget.TextView;
 
-import com.cyanogenmod.explorer.R;
-import com.cyanogenmod.explorer.adapters.HighlightedSimpleMenuListAdapter;
-import com.cyanogenmod.explorer.adapters.HistoryAdapter;
-import com.cyanogenmod.explorer.adapters.SimpleMenuListAdapter;
-import com.cyanogenmod.explorer.model.History;
-import com.cyanogenmod.explorer.ui.widgets.ButtonItem;
-import com.cyanogenmod.explorer.util.DialogHelper;
+import com.cyanogenmod.filemanager.R;
+import com.cyanogenmod.filemanager.adapters.HighlightedSimpleMenuListAdapter;
+import com.cyanogenmod.filemanager.adapters.HistoryAdapter;
+import com.cyanogenmod.filemanager.adapters.SimpleMenuListAdapter;
+import com.cyanogenmod.filemanager.model.History;
+import com.cyanogenmod.filemanager.ui.widgets.ButtonItem;
+import com.cyanogenmod.filemanager.util.DialogHelper;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/com/cyanogenmod/explorer/activities/NavigationActivity.java b/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java
index b2c6c5c6..bfd675a3 100644
--- a/src/com/cyanogenmod/explorer/activities/NavigationActivity.java
+++ b/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.activities;
+package com.cyanogenmod.filemanager.activities;
 
 import android.app.ActionBar;
 import android.app.Activity;
@@ -42,46 +42,46 @@ import android.widget.ListPopupWindow;
 import android.widget.PopupWindow;
 import android.widget.Toast;
 
-import com.cyanogenmod.explorer.ExplorerApplication;
-import com.cyanogenmod.explorer.R;
-import com.cyanogenmod.explorer.activities.preferences.SettingsPreferences;
-import com.cyanogenmod.explorer.adapters.HighlightedSimpleMenuListAdapter;
-import com.cyanogenmod.explorer.adapters.MenuSettingsAdapter;
-import com.cyanogenmod.explorer.adapters.SimpleMenuListAdapter;
-import com.cyanogenmod.explorer.console.Console;
-import com.cyanogenmod.explorer.console.ConsoleAllocException;
-import com.cyanogenmod.explorer.console.ConsoleBuilder;
-import com.cyanogenmod.explorer.console.NoSuchFileOrDirectory;
-import com.cyanogenmod.explorer.listeners.OnHistoryListener;
-import com.cyanogenmod.explorer.listeners.OnRequestRefreshListener;
-import com.cyanogenmod.explorer.model.DiskUsage;
-import com.cyanogenmod.explorer.model.FileSystemObject;
-import com.cyanogenmod.explorer.model.History;
-import com.cyanogenmod.explorer.model.MountPoint;
-import com.cyanogenmod.explorer.parcelables.HistoryNavigable;
-import com.cyanogenmod.explorer.parcelables.NavigationViewInfoParcelable;
-import com.cyanogenmod.explorer.parcelables.SearchInfoParcelable;
-import com.cyanogenmod.explorer.preferences.DefaultLongClickAction;
-import com.cyanogenmod.explorer.preferences.ExplorerSettings;
-import com.cyanogenmod.explorer.preferences.NavigationLayoutMode;
-import com.cyanogenmod.explorer.preferences.ObjectIdentifier;
-import com.cyanogenmod.explorer.preferences.ObjectStringIdentifier;
-import com.cyanogenmod.explorer.preferences.Preferences;
-import com.cyanogenmod.explorer.ui.dialogs.ActionsDialog;
-import com.cyanogenmod.explorer.ui.dialogs.ChooseConsoleDialog;
-import com.cyanogenmod.explorer.ui.dialogs.FilesystemInfoDialog;
-import com.cyanogenmod.explorer.ui.dialogs.FilesystemInfoDialog.OnMountListener;
-import com.cyanogenmod.explorer.ui.widgets.Breadcrumb;
-import com.cyanogenmod.explorer.ui.widgets.NavigationCustomTitleView;
-import com.cyanogenmod.explorer.ui.widgets.NavigationView;
-import com.cyanogenmod.explorer.ui.widgets.NavigationView.OnNavigationRequestMenuListener;
-import com.cyanogenmod.explorer.ui.widgets.NavigationView.OnNavigationSelectionChangedListener;
-import com.cyanogenmod.explorer.ui.widgets.SelectionView;
-import com.cyanogenmod.explorer.util.CommandHelper;
-import com.cyanogenmod.explorer.util.DialogHelper;
-import com.cyanogenmod.explorer.util.ExceptionUtil;
-import com.cyanogenmod.explorer.util.FileHelper;
-import com.cyanogenmod.explorer.util.StorageHelper;
+import com.cyanogenmod.filemanager.FileManagerApplication;
+import com.cyanogenmod.filemanager.R;
+import com.cyanogenmod.filemanager.activities.preferences.SettingsPreferences;
+import com.cyanogenmod.filemanager.adapters.HighlightedSimpleMenuListAdapter;
+import com.cyanogenmod.filemanager.adapters.MenuSettingsAdapter;
+import com.cyanogenmod.filemanager.adapters.SimpleMenuListAdapter;
+import com.cyanogenmod.filemanager.console.Console;
+import com.cyanogenmod.filemanager.console.ConsoleAllocException;
+import com.cyanogenmod.filemanager.console.ConsoleBuilder;
+import com.cyanogenmod.filemanager.console.NoSuchFileOrDirectory;
+import com.cyanogenmod.filemanager.listeners.OnHistoryListener;
+import com.cyanogenmod.filemanager.listeners.OnRequestRefreshListener;
+import com.cyanogenmod.filemanager.model.DiskUsage;
+import com.cyanogenmod.filemanager.model.FileSystemObject;
+import com.cyanogenmod.filemanager.model.History;
+import com.cyanogenmod.filemanager.model.MountPoint;
+import com.cyanogenmod.filemanager.parcelables.HistoryNavigable;
+import com.cyanogenmod.filemanager.parcelables.NavigationViewInfoParcelable;
+import com.cyanogenmod.filemanager.parcelables.SearchInfoParcelable;
+import com.cyanogenmod.filemanager.preferences.DefaultLongClickAction;
+import com.cyanogenmod.filemanager.preferences.FileManagerSettings;
+import com.cyanogenmod.filemanager.preferences.NavigationLayoutMode;
+import com.cyanogenmod.filemanager.preferences.ObjectIdentifier;
+import com.cyanogenmod.filemanager.preferences.ObjectStringIdentifier;
+import com.cyanogenmod.filemanager.preferences.Preferences;
+import com.cyanogenmod.filemanager.ui.dialogs.ActionsDialog;
+import com.cyanogenmod.filemanager.ui.dialogs.ChooseConsoleDialog;
+import com.cyanogenmod.filemanager.ui.dialogs.FilesystemInfoDialog;
+import com.cyanogenmod.filemanager.ui.dialogs.FilesystemInfoDialog.OnMountListener;
+import com.cyanogenmod.filemanager.ui.widgets.Breadcrumb;
+import com.cyanogenmod.filemanager.ui.widgets.NavigationCustomTitleView;
+import com.cyanogenmod.filemanager.ui.widgets.NavigationView;
+import com.cyanogenmod.filemanager.ui.widgets.NavigationView.OnNavigationRequestMenuListener;
+import com.cyanogenmod.filemanager.ui.widgets.NavigationView.OnNavigationSelectionChangedListener;
+import com.cyanogenmod.filemanager.ui.widgets.SelectionView;
+import com.cyanogenmod.filemanager.util.CommandHelper;
+import com.cyanogenmod.filemanager.util.DialogHelper;
+import com.cyanogenmod.filemanager.util.ExceptionUtil;
+import com.cyanogenmod.filemanager.util.FileHelper;
+import com.cyanogenmod.filemanager.util.StorageHelper;
 
 import java.io.FileNotFoundException;
 import java.io.Serializable;
@@ -170,19 +170,19 @@ public class NavigationActivity extends Activity
         @Override
         public void onReceive(Context context, Intent intent) {
             if (intent != null) {
-                if (intent.getAction().compareTo(ExplorerSettings.INTENT_SETTING_CHANGED) == 0) {
+                if (intent.getAction().compareTo(FileManagerSettings.INTENT_SETTING_CHANGED) == 0) {
                     // The settings has changed
-                    String key = intent.getStringExtra(ExplorerSettings.EXTRA_SETTING_CHANGED_KEY);
+                    String key = intent.getStringExtra(FileManagerSettings.EXTRA_SETTING_CHANGED_KEY);
                     if (key != null) {
                         // Disk usage warning level
-                        if (key.compareTo(ExplorerSettings.
+                        if (key.compareTo(FileManagerSettings.
                                 SETTINGS_DISK_USAGE_WARNING_LEVEL.getId()) == 0) {
     
                             // Set the free disk space warning level of the breadcrumb widget
                             Breadcrumb breadcrumb = getCurrentNavigationView().getBreadcrumb();
                             String fds = Preferences.getSharedPreferences().getString(
-                                    ExplorerSettings.SETTINGS_DISK_USAGE_WARNING_LEVEL.getId(),
-                                    (String)ExplorerSettings.
+                                    FileManagerSettings.SETTINGS_DISK_USAGE_WARNING_LEVEL.getId(),
+                                    (String)FileManagerSettings.
                                         SETTINGS_DISK_USAGE_WARNING_LEVEL.getDefaultValue());
                             breadcrumb.setFreeDiskSpaceWarningLevel(Integer.parseInt(fds));
                             breadcrumb.updateMountPointInfo();
@@ -190,11 +190,11 @@ public class NavigationActivity extends Activity
                         }
     
                         // Default long-click action
-                        if (key.compareTo(ExplorerSettings.
+                        if (key.compareTo(FileManagerSettings.
                                 SETTINGS_DEFAULT_LONG_CLICK_ACTION.getId()) == 0) {
-                            String defaultValue = ((ObjectStringIdentifier)ExplorerSettings.
+                            String defaultValue = ((ObjectStringIdentifier)FileManagerSettings.
                                     SETTINGS_DEFAULT_LONG_CLICK_ACTION.getDefaultValue()).getId();
-                            String id = ExplorerSettings.
+                            String id = FileManagerSettings.
                                     SETTINGS_DEFAULT_LONG_CLICK_ACTION.getId();
                             String value =
                                     Preferences.getSharedPreferences().getString(id, defaultValue);
@@ -204,17 +204,17 @@ public class NavigationActivity extends Activity
                         }
     
                         // Case sensitive sort
-                        if (key.compareTo(ExplorerSettings.
+                        if (key.compareTo(FileManagerSettings.
                                 SETTINGS_CASE_SENSITIVE_SORT.getId()) == 0) {
                             getCurrentNavigationView().refresh();
                             return;
                         }
     
                         // Advanced mode
-                        if (key.compareTo(ExplorerSettings.
+                        if (key.compareTo(FileManagerSettings.
                                 SETTINGS_ADVANCE_MODE.getId()) == 0) {
                             // Is it necessary to create or exit of the ChRooted?
-                            boolean chRooted = !ExplorerApplication.isAdvancedMode();
+                            boolean chRooted = !FileManagerApplication.isAdvancedMode();
                             if (chRooted != NavigationActivity.this.mChRooted) {
                                 if (chRooted) {
                                     createChRooted();
@@ -226,10 +226,10 @@ public class NavigationActivity extends Activity
                     }
 
                 } else if (intent.getAction().compareTo(
-                        ExplorerSettings.INTENT_FILE_CHANGED) == 0) {
+                        FileManagerSettings.INTENT_FILE_CHANGED) == 0) {
                     // Retrieve the file that was changed
                     String file =
-                            intent.getStringExtra(ExplorerSettings.EXTRA_FILE_CHANGED_KEY);
+                            intent.getStringExtra(FileManagerSettings.EXTRA_FILE_CHANGED_KEY);
                     try {
                         FileSystemObject fso = CommandHelper.getFileInfo(context, file, null);
                         if (fso != null) {
@@ -279,8 +279,8 @@ public class NavigationActivity extends Activity
 
         // Register the broadcast receiver
         IntentFilter filter = new IntentFilter();
-        filter.addAction(ExplorerSettings.INTENT_SETTING_CHANGED);
-        filter.addAction(ExplorerSettings.INTENT_FILE_CHANGED);
+        filter.addAction(FileManagerSettings.INTENT_SETTING_CHANGED);
+        filter.addAction(FileManagerSettings.INTENT_FILE_CHANGED);
         registerReceiver(this.mOnSettingChangeReceiver, filter);
 
         //Request features
@@ -378,7 +378,7 @@ public class NavigationActivity extends Activity
      */
     private void init() {
         this.mHistory = new ArrayList<History>();
-        this.mChRooted = !ExplorerApplication.isAdvancedMode();
+        this.mChRooted = !FileManagerApplication.isAdvancedMode();
     }
 
     /**
@@ -387,8 +387,8 @@ public class NavigationActivity extends Activity
      */
     private void showWelcomeMsg() {
         boolean firstUse = Preferences.getSharedPreferences().getBoolean(
-                ExplorerSettings.SETTINGS_FIRST_USE.getId(),
-                ((Boolean)ExplorerSettings.SETTINGS_FIRST_USE.getDefaultValue()).booleanValue());
+                FileManagerSettings.SETTINGS_FIRST_USE.getId(),
+                ((Boolean)FileManagerSettings.SETTINGS_FIRST_USE.getDefaultValue()).booleanValue());
 
         //Display the welcome message?
         if (firstUse) {
@@ -399,7 +399,7 @@ public class NavigationActivity extends Activity
             // Don't display again this dialog
             try {
                 Preferences.savePreference(
-                        ExplorerSettings.SETTINGS_FIRST_USE, Boolean.FALSE, true);
+                        FileManagerSettings.SETTINGS_FIRST_USE, Boolean.FALSE, true);
             } catch (Exception e) {/**NON BLOCK**/}
         }
     }
@@ -425,8 +425,8 @@ public class NavigationActivity extends Activity
 
         // Set the free disk space warning level of the breadcrumb widget
         String fds = Preferences.getSharedPreferences().getString(
-                ExplorerSettings.SETTINGS_DISK_USAGE_WARNING_LEVEL.getId(),
-                (String)ExplorerSettings.SETTINGS_DISK_USAGE_WARNING_LEVEL.getDefaultValue());
+                FileManagerSettings.SETTINGS_DISK_USAGE_WARNING_LEVEL.getId(),
+                (String)FileManagerSettings.SETTINGS_DISK_USAGE_WARNING_LEVEL.getDefaultValue());
         breadcrumb.setFreeDiskSpaceWarningLevel(Integer.parseInt(fds));
 
         //Configure the action bar options
@@ -531,8 +531,8 @@ public class NavigationActivity extends Activity
                     //Load the preference initial directory
                     String initialDir =
                             Preferences.getSharedPreferences().getString(
-                                ExplorerSettings.SETTINGS_INITIAL_DIR.getId(),
-                                (String)ExplorerSettings.SETTINGS_INITIAL_DIR.getDefaultValue());
+                                FileManagerSettings.SETTINGS_INITIAL_DIR.getId(),
+                                (String)FileManagerSettings.SETTINGS_INITIAL_DIR.getDefaultValue());
                     if (NavigationActivity.this.mChRooted) {
                         // Initial directory is the first external sdcard (sdcard, emmc, usb, ...)
                         StorageVolume[] volumes =
@@ -686,26 +686,26 @@ public class NavigationActivity extends Activity
             //######################
             case R.id.ab_sort_mode:
                 showSettingsPopUp(view,
-                        Arrays.asList(new ExplorerSettings[]{ExplorerSettings.SETTINGS_SORT_MODE}));
+                        Arrays.asList(new FileManagerSettings[]{FileManagerSettings.SETTINGS_SORT_MODE}));
                 break;
             case R.id.ab_layout_mode:
                 showSettingsPopUp(view,
                         Arrays.asList(
-                                new ExplorerSettings[]{ExplorerSettings.SETTINGS_LAYOUT_MODE}));
+                                new FileManagerSettings[]{FileManagerSettings.SETTINGS_LAYOUT_MODE}));
                 break;
             case R.id.ab_view_options:
                 // If we are in ChRooted mode, then don't show non-secure items
                 if (this.mChRooted) {
                     showSettingsPopUp(view,
-                            Arrays.asList(new ExplorerSettings[]{
-                                    ExplorerSettings.SETTINGS_SHOW_DIRS_FIRST}));
+                            Arrays.asList(new FileManagerSettings[]{
+                                    FileManagerSettings.SETTINGS_SHOW_DIRS_FIRST}));
                 } else {
                     showSettingsPopUp(view,
-                            Arrays.asList(new ExplorerSettings[]{
-                                    ExplorerSettings.SETTINGS_SHOW_DIRS_FIRST,
-                                    ExplorerSettings.SETTINGS_SHOW_HIDDEN,
-                                    ExplorerSettings.SETTINGS_SHOW_SYSTEM,
-                                    ExplorerSettings.SETTINGS_SHOW_SYMLINKS}));
+                            Arrays.asList(new FileManagerSettings[]{
+                                    FileManagerSettings.SETTINGS_SHOW_DIRS_FIRST,
+                                    FileManagerSettings.SETTINGS_SHOW_HIDDEN,
+                                    FileManagerSettings.SETTINGS_SHOW_SYSTEM,
+                                    FileManagerSettings.SETTINGS_SHOW_SYMLINKS}));
                 }
 
                 break;
@@ -890,12 +890,12 @@ public class NavigationActivity extends Activity
     }
 
     /**
-     * Method that shows a popup with a menu associated a {@link ExplorerSetting}.
+     * Method that shows a popup with a menu associated a {@link FileManagerSettings}.
      *
      * @param anchor The action button that was pressed
      * @param settings The array of settings associated with the action button
      */
-    private void showSettingsPopUp(View anchor, List<ExplorerSettings> settings) {
+    private void showSettingsPopUp(View anchor, List<FileManagerSettings> settings) {
         //Create the adapter
         final MenuSettingsAdapter adapter = new MenuSettingsAdapter(this, settings);
 
@@ -904,12 +904,12 @@ public class NavigationActivity extends Activity
         popup.setOnItemClickListener(new OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> parent, View v, int position, long id) {
-                ExplorerSettings setting =
+                FileManagerSettings setting =
                         ((MenuSettingsAdapter)parent.getAdapter()).getSetting(position);
                 final int value = ((MenuSettingsAdapter)parent.getAdapter()).getId(position);
                 popup.dismiss();
                 try {
-                    if (setting.compareTo(ExplorerSettings.SETTINGS_LAYOUT_MODE) == 0) {
+                    if (setting.compareTo(FileManagerSettings.SETTINGS_LAYOUT_MODE) == 0) {
                         //Need to change the layout
                         getCurrentNavigationView().changeViewMode(
                                 NavigationLayoutMode.fromId(value));
@@ -1362,10 +1362,10 @@ public class NavigationActivity extends Activity
 
                             // Save preferences
                             Preferences.savePreference(
-                                    ExplorerSettings.SETTINGS_ADVANCE_MODE,
+                                    FileManagerSettings.SETTINGS_ADVANCE_MODE,
                                     Boolean.TRUE, true);
                             Preferences.savePreference(
-                                    ExplorerSettings.SETTINGS_SUPERUSER_MODE,
+                                    FileManagerSettings.SETTINGS_SUPERUSER_MODE,
                                     Boolean.FALSE, true);
 
                         } catch (Exception e) {
@@ -1427,7 +1427,7 @@ public class NavigationActivity extends Activity
      */
     void exit() {
         try {
-            ExplorerApplication.destroyBackgroundConsole();
+            FileManagerApplication.destroyBackgroundConsole();
         } catch (Throwable ex) {
             /**NON BLOCK**/
         }
diff --git a/src/com/cyanogenmod/explorer/activities/PickerActivity.java b/src/com/cyanogenmod/filemanager/activities/PickerActivity.java
index b0cbb814..f9de0773 100644
--- a/src/com/cyanogenmod/explorer/activities/PickerActivity.java
+++ b/src/com/cyanogenmod/filemanager/activities/PickerActivity.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.activities;
+package com.cyanogenmod.filemanager.activities;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -37,20 +37,20 @@ import android.widget.FrameLayout;
 import android.widget.ListPopupWindow;
 import android.widget.Toast;
 
-import com.cyanogenmod.explorer.R;
-import com.cyanogenmod.explorer.adapters.CheckableListAdapter;
-import com.cyanogenmod.explorer.adapters.CheckableListAdapter.CheckableItem;
-import com.cyanogenmod.explorer.console.ConsoleBuilder;
-import com.cyanogenmod.explorer.model.FileSystemObject;
-import com.cyanogenmod.explorer.preferences.ExplorerSettings;
-import com.cyanogenmod.explorer.preferences.Preferences;
-import com.cyanogenmod.explorer.ui.widgets.Breadcrumb;
-import com.cyanogenmod.explorer.ui.widgets.NavigationView;
-import com.cyanogenmod.explorer.ui.widgets.NavigationView.OnFilePickedListener;
-import com.cyanogenmod.explorer.util.DialogHelper;
-import com.cyanogenmod.explorer.util.ExceptionUtil;
-import com.cyanogenmod.explorer.util.FileHelper;
-import com.cyanogenmod.explorer.util.StorageHelper;
+import com.cyanogenmod.filemanager.R;
+import com.cyanogenmod.filemanager.adapters.CheckableListAdapter;
+import com.cyanogenmod.filemanager.adapters.CheckableListAdapter.CheckableItem;
+import com.cyanogenmod.filemanager.console.ConsoleBuilder;
+import com.cyanogenmod.filemanager.model.FileSystemObject;
+import com.cyanogenmod.filemanager.preferences.FileManagerSettings;
+import com.cyanogenmod.filemanager.preferences.Preferences;
+import com.cyanogenmod.filemanager.ui.widgets.Breadcrumb;
+import com.cyanogenmod.filemanager.ui.widgets.NavigationView;
+import com.cyanogenmod.filemanager.ui.widgets.NavigationView.OnFilePickedListener;
+import com.cyanogenmod.filemanager.util.DialogHelper;
+import com.cyanogenmod.filemanager.util.ExceptionUtil;
+import com.cyanogenmod.filemanager.util.FileHelper;
+import com.cyanogenmod.filemanager.util.StorageHelper;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -139,8 +139,8 @@ public class PickerActivity extends Activity
         Breadcrumb breadcrumb = (Breadcrumb)rootView.findViewById(R.id.breadcrumb_view);
         // Set the free disk space warning level of the breadcrumb widget
         String fds = Preferences.getSharedPreferences().getString(
-                ExplorerSettings.SETTINGS_DISK_USAGE_WARNING_LEVEL.getId(),
-                (String)ExplorerSettings.SETTINGS_DISK_USAGE_WARNING_LEVEL.getDefaultValue());
+                FileManagerSettings.SETTINGS_DISK_USAGE_WARNING_LEVEL.getId(),
+                (String)FileManagerSettings.SETTINGS_DISK_USAGE_WARNING_LEVEL.getDefaultValue());
         breadcrumb.setFreeDiskSpaceWarningLevel(Integer.parseInt(fds));
 
         // Navigation view
diff --git a/src/com/cyanogenmod/explorer/activities/SearchActivity.java b/src/com/cyanogenmod/filemanager/activities/SearchActivity.java
index 75dd3b8f..8bc2c30e 100644
--- a/src/com/cyanogenmod/explorer/activities/SearchActivity.java
+++ b/src/com/cyanogenmod/filemanager/activities/SearchActivity.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.activities;
+package com.cyanogenmod.filemanager.activities;
 
 import android.app.ActionBar;
 import android.app.Activity;
@@ -45,38 +45,38 @@ import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.cyanogenmod.explorer.ExplorerApplication;
-import com.cyanogenmod.explorer.R;
-import com.cyanogenmod.explorer.activities.preferences.SettingsPreferences;
-import com.cyanogenmod.explorer.activities.preferences.SettingsPreferences.SearchPreferenceFragment;
-import com.cyanogenmod.explorer.adapters.SearchResultAdapter;
-import com.cyanogenmod.explorer.adapters.SearchResultAdapter.OnRequestMenuListener;
-import com.cyanogenmod.explorer.commands.AsyncResultExecutable;
-import com.cyanogenmod.explorer.commands.AsyncResultListener;
-import com.cyanogenmod.explorer.console.NoSuchFileOrDirectory;
-import com.cyanogenmod.explorer.listeners.OnRequestRefreshListener;
-import com.cyanogenmod.explorer.model.Directory;
-import com.cyanogenmod.explorer.model.FileSystemObject;
-import com.cyanogenmod.explorer.model.Query;
-import com.cyanogenmod.explorer.model.SearchResult;
-import com.cyanogenmod.explorer.model.Symlink;
-import com.cyanogenmod.explorer.parcelables.SearchInfoParcelable;
-import com.cyanogenmod.explorer.preferences.DefaultLongClickAction;
-import com.cyanogenmod.explorer.preferences.ExplorerSettings;
-import com.cyanogenmod.explorer.preferences.ObjectStringIdentifier;
-import com.cyanogenmod.explorer.preferences.Preferences;
-import com.cyanogenmod.explorer.providers.RecentSearchesContentProvider;
-import com.cyanogenmod.explorer.tasks.SearchResultDrawingAsyncTask;
-import com.cyanogenmod.explorer.ui.dialogs.ActionsDialog;
-import com.cyanogenmod.explorer.ui.dialogs.MessageProgressDialog;
-import com.cyanogenmod.explorer.ui.policy.InfoActionPolicy;
-import com.cyanogenmod.explorer.ui.policy.IntentsActionPolicy;
-import com.cyanogenmod.explorer.ui.widgets.ButtonItem;
-import com.cyanogenmod.explorer.util.CommandHelper;
-import com.cyanogenmod.explorer.util.DialogHelper;
-import com.cyanogenmod.explorer.util.ExceptionUtil;
-import com.cyanogenmod.explorer.util.FileHelper;
-import com.cyanogenmod.explorer.util.StorageHelper;
+import com.cyanogenmod.filemanager.FileManagerApplication;
+import com.cyanogenmod.filemanager.R;
+import com.cyanogenmod.filemanager.activities.preferences.SettingsPreferences;
+import com.cyanogenmod.filemanager.activities.preferences.SettingsPreferences.SearchPreferenceFragment;
+import com.cyanogenmod.filemanager.adapters.SearchResultAdapter;
+import com.cyanogenmod.filemanager.adapters.SearchResultAdapter.OnRequestMenuListener;
+import com.cyanogenmod.filemanager.commands.AsyncResultExecutable;
+import com.cyanogenmod.filemanager.commands.AsyncResultListener;
+import com.cyanogenmod.filemanager.console.NoSuchFileOrDirectory;
+import com.cyanogenmod.filemanager.listeners.OnRequestRefreshListener;
+import com.cyanogenmod.filemanager.model.Directory;
+import com.cyanogenmod.filemanager.model.FileSystemObject;
+import com.cyanogenmod.filemanager.model.Query;
+import com.cyanogenmod.filemanager.model.SearchResult;
+import com.cyanogenmod.filemanager.model.Symlink;
+import com.cyanogenmod.filemanager.parcelables.SearchInfoParcelable;
+import com.cyanogenmod.filemanager.preferences.DefaultLongClickAction;
+import com.cyanogenmod.filemanager.preferences.FileManagerSettings;
+import com.cyanogenmod.filemanager.preferences.ObjectStringIdentifier;
+import com.cyanogenmod.filemanager.preferences.Preferences;
+import com.cyanogenmod.filemanager.providers.RecentSearchesContentProvider;
+import com.cyanogenmod.filemanager.tasks.SearchResultDrawingAsyncTask;
+import com.cyanogenmod.filemanager.ui.dialogs.ActionsDialog;
+import com.cyanogenmod.filemanager.ui.dialogs.MessageProgressDialog;
+import com.cyanogenmod.filemanager.ui.policy.InfoActionPolicy;
+import com.cyanogenmod.filemanager.ui.policy.IntentsActionPolicy;
+import com.cyanogenmod.filemanager.ui.widgets.ButtonItem;
+import com.cyanogenmod.filemanager.util.CommandHelper;
+import com.cyanogenmod.filemanager.util.DialogHelper;
+import com.cyanogenmod.filemanager.util.ExceptionUtil;
+import com.cyanogenmod.filemanager.util.FileHelper;
+import com.cyanogenmod.filemanager.util.StorageHelper;
 
 import java.io.FileNotFoundException;
 import java.util.ArrayList;
@@ -97,7 +97,7 @@ public class SearchActivity extends Activity
      * An {@link Intent} action for restore view information.
      */
     public static final String ACTION_RESTORE =
-            "com.cyanogenmod.explorer.activities.SearchActivity#Restore"; //$NON-NLS-1$
+            "com.cyanogenmod.filemanager.activities.SearchActivity#Restore"; //$NON-NLS-1$
 
     /**
      * Intent extra parameter for search in the selected directory on enter.
@@ -117,18 +117,18 @@ public class SearchActivity extends Activity
         @Override
         public void onReceive(Context context, Intent intent) {
             if (intent != null &&
-                intent.getAction().compareTo(ExplorerSettings.INTENT_SETTING_CHANGED) == 0) {
+                intent.getAction().compareTo(FileManagerSettings.INTENT_SETTING_CHANGED) == 0) {
 
                 // The settings has changed
-                String key = intent.getStringExtra(ExplorerSettings.EXTRA_SETTING_CHANGED_KEY);
+                String key = intent.getStringExtra(FileManagerSettings.EXTRA_SETTING_CHANGED_KEY);
                 if (key != null) {
                     if (SearchActivity.this.mSearchListView.getAdapter() != null &&
                        (key.compareTo(
-                               ExplorerSettings.SETTINGS_HIGHLIGHT_TERMS.getId()) == 0 ||
+                               FileManagerSettings.SETTINGS_HIGHLIGHT_TERMS.getId()) == 0 ||
                         key.compareTo(
-                                ExplorerSettings.SETTINGS_SHOW_RELEVANCE_WIDGET.getId()) == 0 ||
+                                FileManagerSettings.SETTINGS_SHOW_RELEVANCE_WIDGET.getId()) == 0 ||
                         key.compareTo(
-                                ExplorerSettings.SETTINGS_SORT_SEARCH_RESULTS_MODE.getId()) == 0)) {
+                                FileManagerSettings.SETTINGS_SORT_SEARCH_RESULTS_MODE.getId()) == 0)) {
 
                         // Recreate the adapter
                         int pos = SearchActivity.this.mSearchListView.getFirstVisiblePosition();
@@ -138,11 +138,11 @@ public class SearchActivity extends Activity
                     }
 
                     // Default long-click action
-                    if (key.compareTo(ExplorerSettings.
+                    if (key.compareTo(FileManagerSettings.
                             SETTINGS_DEFAULT_LONG_CLICK_ACTION.getId()) == 0) {
-                        String defaultValue = ((ObjectStringIdentifier)ExplorerSettings.
+                        String defaultValue = ((ObjectStringIdentifier)FileManagerSettings.
                                 SETTINGS_DEFAULT_LONG_CLICK_ACTION.getDefaultValue()).getId();
-                        String id = ExplorerSettings.SETTINGS_DEFAULT_LONG_CLICK_ACTION.getId();
+                        String id = FileManagerSettings.SETTINGS_DEFAULT_LONG_CLICK_ACTION.getId();
                         String value =
                                 Preferences.getSharedPreferences().getString(id, defaultValue);
                         SearchActivity.this.mDefaultLongClickAction =
@@ -227,20 +227,20 @@ public class SearchActivity extends Activity
         }
 
         // Check if app is running in chrooted mode
-        this.mChRooted = !ExplorerApplication.isAdvancedMode();
+        this.mChRooted = !FileManagerApplication.isAdvancedMode();
 
         // Default long-click action
-        String defaultValue = ((ObjectStringIdentifier)ExplorerSettings.
+        String defaultValue = ((ObjectStringIdentifier)FileManagerSettings.
                 SETTINGS_DEFAULT_LONG_CLICK_ACTION.getDefaultValue()).getId();
         String value = Preferences.getSharedPreferences().getString(
-                            ExplorerSettings.SETTINGS_DEFAULT_LONG_CLICK_ACTION.getId(),
+                            FileManagerSettings.SETTINGS_DEFAULT_LONG_CLICK_ACTION.getId(),
                             defaultValue);
         DefaultLongClickAction mode = DefaultLongClickAction.fromId(value);
         this.mDefaultLongClickAction = mode;
 
         // Register the broadcast receiver
         IntentFilter filter = new IntentFilter();
-        filter.addAction(ExplorerSettings.INTENT_SETTING_CHANGED);
+        filter.addAction(FileManagerSettings.INTENT_SETTING_CHANGED);
         registerReceiver(this.mOnSettingChangeReceiver, filter);
 
         //Request features
@@ -528,8 +528,8 @@ public class SearchActivity extends Activity
 
         // Recovers the user preferences about save suggestions
         boolean saveSuggestions = Preferences.getSharedPreferences().getBoolean(
-                ExplorerSettings.SETTINGS_SAVE_SEARCH_TERMS.getId(),
-                ((Boolean)ExplorerSettings.SETTINGS_SAVE_SEARCH_TERMS.
+                FileManagerSettings.SETTINGS_SAVE_SEARCH_TERMS.getId(),
+                ((Boolean)FileManagerSettings.SETTINGS_SAVE_SEARCH_TERMS.
                         getDefaultValue()).booleanValue());
         if (saveSuggestions) {
             //Save every query for use as recent suggestions
diff --git a/src/com/cyanogenmod/explorer/activities/ShortcutActivity.java b/src/com/cyanogenmod/filemanager/activities/ShortcutActivity.java
index f8527b2b..52463132 100644
--- a/src/com/cyanogenmod/explorer/activities/ShortcutActivity.java
+++ b/src/com/cyanogenmod/filemanager/activities/ShortcutActivity.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.activities;
+package com.cyanogenmod.filemanager.activities;
 
 import android.app.Activity;
 import android.content.DialogInterface;
@@ -25,13 +25,13 @@ import android.os.Bundle;
 import android.util.Log;
 import android.widget.Toast;
 
-import com.cyanogenmod.explorer.R;
-import com.cyanogenmod.explorer.console.ConsoleBuilder;
-import com.cyanogenmod.explorer.model.FileSystemObject;
-import com.cyanogenmod.explorer.ui.policy.IntentsActionPolicy;
-import com.cyanogenmod.explorer.util.CommandHelper;
-import com.cyanogenmod.explorer.util.DialogHelper;
-import com.cyanogenmod.explorer.util.ExceptionUtil;
+import com.cyanogenmod.filemanager.R;
+import com.cyanogenmod.filemanager.console.ConsoleBuilder;
+import com.cyanogenmod.filemanager.model.FileSystemObject;
+import com.cyanogenmod.filemanager.ui.policy.IntentsActionPolicy;
+import com.cyanogenmod.filemanager.util.CommandHelper;
+import com.cyanogenmod.filemanager.util.DialogHelper;
+import com.cyanogenmod.filemanager.util.ExceptionUtil;
 
 /**
  * The activity for handle the desktop shortcuts create by the app.
diff --git a/src/com/cyanogenmod/explorer/activities/preferences/SettingsPreferences.java b/src/com/cyanogenmod/filemanager/activities/preferences/SettingsPreferences.java
index 0df33f5b..d6fa03f9 100644
--- a/src/com/cyanogenmod/explorer/activities/preferences/SettingsPreferences.java
+++ b/src/com/cyanogenmod/filemanager/activities/preferences/SettingsPreferences.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.activities.preferences;
+package com.cyanogenmod.filemanager.activities.preferences;
 
 import android.app.ActionBar;
 import android.content.Intent;
@@ -33,13 +33,13 @@ import android.view.View;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.cyanogenmod.explorer.ExplorerApplication;
-import com.cyanogenmod.explorer.R;
-import com.cyanogenmod.explorer.preferences.ExplorerSettings;
-import com.cyanogenmod.explorer.preferences.ObjectStringIdentifier;
-import com.cyanogenmod.explorer.preferences.Preferences;
-import com.cyanogenmod.explorer.providers.RecentSearchesContentProvider;
-import com.cyanogenmod.explorer.util.DialogHelper;
+import com.cyanogenmod.filemanager.FileManagerApplication;
+import com.cyanogenmod.filemanager.R;
+import com.cyanogenmod.filemanager.preferences.FileManagerSettings;
+import com.cyanogenmod.filemanager.preferences.ObjectStringIdentifier;
+import com.cyanogenmod.filemanager.preferences.Preferences;
+import com.cyanogenmod.filemanager.providers.RecentSearchesContentProvider;
+import com.cyanogenmod.filemanager.util.DialogHelper;
 
 import java.util.List;
 
@@ -140,7 +140,7 @@ public class SettingsPreferences extends PreferenceActivity {
                                 String.valueOf(newValue)));
 
                 // Default long-click action
-                if (ExplorerSettings.SETTINGS_DEFAULT_LONG_CLICK_ACTION.
+                if (FileManagerSettings.SETTINGS_DEFAULT_LONG_CLICK_ACTION.
                         getId().compareTo(key) == 0) {
                     int value = Integer.valueOf((String)newValue).intValue();
                     String[] summary = getResources().getStringArray(
@@ -149,7 +149,7 @@ public class SettingsPreferences extends PreferenceActivity {
                 }
 
                 // Disk usage warning level
-                else if (ExplorerSettings.SETTINGS_DISK_USAGE_WARNING_LEVEL.
+                else if (FileManagerSettings.SETTINGS_DISK_USAGE_WARNING_LEVEL.
                         getId().compareTo(key) == 0) {
                     String value = (String)newValue;
                     preference.setSummary(
@@ -160,9 +160,9 @@ public class SettingsPreferences extends PreferenceActivity {
                 // Notify the change (only if fragment is loaded. Default values are loaded
                 // while not in loaded mode)
                 if (GeneralPreferenceFragment.this.mLoaded) {
-                    Intent intent = new Intent(ExplorerSettings.INTENT_SETTING_CHANGED);
+                    Intent intent = new Intent(FileManagerSettings.INTENT_SETTING_CHANGED);
                     intent.putExtra(
-                            ExplorerSettings.EXTRA_SETTING_CHANGED_KEY, preference.getKey());
+                            FileManagerSettings.EXTRA_SETTING_CHANGED_KEY, preference.getKey());
                     getActivity().sendBroadcast(intent);
                 }
 
@@ -187,44 +187,44 @@ public class SettingsPreferences extends PreferenceActivity {
             // Case sensitive sort
             this.mCaseSensitiveSort =
                     (CheckBoxPreference)findPreference(
-                            ExplorerSettings.SETTINGS_CASE_SENSITIVE_SORT.getId());
+                            FileManagerSettings.SETTINGS_CASE_SENSITIVE_SORT.getId());
             this.mCaseSensitiveSort.setOnPreferenceChangeListener(this.mOnChangeListener);
 
             // Default long-click action
             this.mDefaultLongClickAction =
                     (ListPreference)findPreference(
-                            ExplorerSettings.SETTINGS_DEFAULT_LONG_CLICK_ACTION.getId());
+                            FileManagerSettings.SETTINGS_DEFAULT_LONG_CLICK_ACTION.getId());
             this.mDefaultLongClickAction.setOnPreferenceChangeListener(this.mOnChangeListener);
-            String defaultValue = ((ObjectStringIdentifier)ExplorerSettings.
+            String defaultValue = ((ObjectStringIdentifier)FileManagerSettings.
                                     SETTINGS_DEFAULT_LONG_CLICK_ACTION.getDefaultValue()).getId();
             String value = Preferences.getSharedPreferences().getString(
-                                    ExplorerSettings.SETTINGS_DEFAULT_LONG_CLICK_ACTION.getId(),
+                                    FileManagerSettings.SETTINGS_DEFAULT_LONG_CLICK_ACTION.getId(),
                                     defaultValue);
             this.mOnChangeListener.onPreferenceChange(this.mDefaultLongClickAction, value);
 
             //Disk usage warning level
             this.mFreeDiskSpaceWarningLevel =
                     (ListPreference)findPreference(
-                            ExplorerSettings.SETTINGS_DISK_USAGE_WARNING_LEVEL.getId());
+                            FileManagerSettings.SETTINGS_DISK_USAGE_WARNING_LEVEL.getId());
             this.mFreeDiskSpaceWarningLevel.setOnPreferenceChangeListener(this.mOnChangeListener);
-            defaultValue = ((String)ExplorerSettings.
+            defaultValue = ((String)FileManagerSettings.
                                 SETTINGS_DISK_USAGE_WARNING_LEVEL.getDefaultValue());
             value = Preferences.getSharedPreferences().getString(
-                                ExplorerSettings.SETTINGS_DISK_USAGE_WARNING_LEVEL.getId(),
+                                FileManagerSettings.SETTINGS_DISK_USAGE_WARNING_LEVEL.getId(),
                                 defaultValue);
             this.mOnChangeListener.onPreferenceChange(this.mFreeDiskSpaceWarningLevel, value);
 
             // Compute folder statistics
             this.mComputeFolderStatistics =
                     (CheckBoxPreference)findPreference(
-                            ExplorerSettings.SETTINGS_COMPUTE_FOLDER_STATISTICS.getId());
+                            FileManagerSettings.SETTINGS_COMPUTE_FOLDER_STATISTICS.getId());
             this.mComputeFolderStatistics.setOnPreferenceChangeListener(this.mOnChangeListener);
 
             // Advanced settings
             this.mAdvancedSettings =
                     (CheckBoxPreference)findPreference(
-                            ExplorerSettings.SETTINGS_ADVANCE_MODE.getId());
-            if (ExplorerApplication.isDeviceRooted()) {
+                            FileManagerSettings.SETTINGS_ADVANCE_MODE.getId());
+            if (FileManagerApplication.isDeviceRooted()) {
                 this.mAdvancedSettings.setOnPreferenceChangeListener(this.mOnChangeListener);
             } else {
                 // Disable the advanced mode
@@ -234,7 +234,7 @@ public class SettingsPreferences extends PreferenceActivity {
             // Capture Debug traces
             this.mDebugTraces =
                     (CheckBoxPreference)findPreference(
-                            ExplorerSettings.SETTINGS_SHOW_TRACES.getId());
+                            FileManagerSettings.SETTINGS_SHOW_TRACES.getId());
             this.mDebugTraces.setOnPreferenceChangeListener(this.mOnChangeListener);
 
             // Loaded
@@ -249,7 +249,7 @@ public class SettingsPreferences extends PreferenceActivity {
 
         // Internal keys
         private static final String REMOVE_SEARCH_TERMS_KEY =
-                                            "cm_explorer_remove_saved_search_terms"; //$NON-NLS-1$
+                                            "cm_filemanager_remove_saved_search_terms"; //$NON-NLS-1$
 
         private CheckBoxPreference mHighlightTerms;
         private CheckBoxPreference mShowRelevanceWidget;
@@ -274,7 +274,7 @@ public class SettingsPreferences extends PreferenceActivity {
 
                 // Saved search terms
                 if (preference.getKey().compareTo(
-                        ExplorerSettings.SETTINGS_SAVE_SEARCH_TERMS.getId()) == 0) {
+                        FileManagerSettings.SETTINGS_SAVE_SEARCH_TERMS.getId()) == 0) {
                     if (!((Boolean)newValue).booleanValue()) {
                         // Remove search terms if saved search terms
                         // is not active by the user
@@ -282,7 +282,7 @@ public class SettingsPreferences extends PreferenceActivity {
                     }
 
                 // Sort search result mode
-                } else if (ExplorerSettings.SETTINGS_SORT_SEARCH_RESULTS_MODE.
+                } else if (FileManagerSettings.SETTINGS_SORT_SEARCH_RESULTS_MODE.
                         getId().compareTo(key) == 0) {
                     int value = Integer.valueOf((String)newValue).intValue();
                     String[] summary = getResources().getStringArray(
@@ -293,9 +293,9 @@ public class SettingsPreferences extends PreferenceActivity {
                 // Notify the change (only if fragment is loaded. Default values are loaded
                 // while not in loaded mode)
                 if (SearchPreferenceFragment.this.mLoaded) {
-                    Intent intent = new Intent(ExplorerSettings.INTENT_SETTING_CHANGED);
+                    Intent intent = new Intent(FileManagerSettings.INTENT_SETTING_CHANGED);
                     intent.putExtra(
-                            ExplorerSettings.EXTRA_SETTING_CHANGED_KEY, preference.getKey());
+                            FileManagerSettings.EXTRA_SETTING_CHANGED_KEY, preference.getKey());
                     getActivity().sendBroadcast(intent);
                 }
 
@@ -339,31 +339,31 @@ public class SettingsPreferences extends PreferenceActivity {
             // Highlight terms
             this.mHighlightTerms =
                     (CheckBoxPreference)findPreference(
-                            ExplorerSettings.SETTINGS_HIGHLIGHT_TERMS.getId());
+                            FileManagerSettings.SETTINGS_HIGHLIGHT_TERMS.getId());
             this.mHighlightTerms.setOnPreferenceChangeListener(this.mOnChangeListener);
 
             // Relevance widget
             this.mShowRelevanceWidget =
                     (CheckBoxPreference)findPreference(
-                            ExplorerSettings.SETTINGS_SHOW_RELEVANCE_WIDGET.getId());
+                            FileManagerSettings.SETTINGS_SHOW_RELEVANCE_WIDGET.getId());
             this.mShowRelevanceWidget.setOnPreferenceChangeListener(this.mOnChangeListener);
 
             // Sort search result mode
             this.mSortSearchResultMode =
                     (ListPreference)findPreference(
-                            ExplorerSettings.SETTINGS_SORT_SEARCH_RESULTS_MODE.getId());
+                            FileManagerSettings.SETTINGS_SORT_SEARCH_RESULTS_MODE.getId());
             this.mSortSearchResultMode.setOnPreferenceChangeListener(this.mOnChangeListener);
-            String defaultValue = ((ObjectStringIdentifier)ExplorerSettings.
+            String defaultValue = ((ObjectStringIdentifier)FileManagerSettings.
                                     SETTINGS_SORT_SEARCH_RESULTS_MODE.getDefaultValue()).getId();
             String value = Preferences.getSharedPreferences().getString(
-                                    ExplorerSettings.SETTINGS_SORT_SEARCH_RESULTS_MODE.getId(),
+                                    FileManagerSettings.SETTINGS_SORT_SEARCH_RESULTS_MODE.getId(),
                                     defaultValue);
             this.mOnChangeListener.onPreferenceChange(this.mSortSearchResultMode, value);
 
             // Saved search terms
             this.mSaveSearchTerms =
                     (CheckBoxPreference)findPreference(
-                            ExplorerSettings.SETTINGS_SAVE_SEARCH_TERMS.getId());
+                            FileManagerSettings.SETTINGS_SAVE_SEARCH_TERMS.getId());
             this.mSaveSearchTerms.setOnPreferenceChangeListener(this.mOnChangeListener);
 
             // Remove search terms
diff --git a/src/com/cyanogenmod/explorer/adapters/AssociationsAdapter.java b/src/com/cyanogenmod/filemanager/adapters/AssociationsAdapter.java
index df99f054..06065716 100644
--- a/src/com/cyanogenmod/explorer/adapters/AssociationsAdapter.java
+++ b/src/com/cyanogenmod/filemanager/adapters/AssociationsAdapter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.adapters;
+package com.cyanogenmod.filemanager.adapters;
 
 import android.content.Context;
 import android.content.pm.ResolveInfo;
@@ -27,7 +27,7 @@ import android.widget.ArrayAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.cyanogenmod.explorer.R;
+import com.cyanogenmod.filemanager.R;
 
 import java.util.List;
 
diff --git a/src/com/cyanogenmod/explorer/adapters/BookmarksAdapter.java b/src/com/cyanogenmod/filemanager/adapters/BookmarksAdapter.java
index c4d90172..dc1e7c79 100644
--- a/src/com/cyanogenmod/explorer/adapters/BookmarksAdapter.java
+++ b/src/com/cyanogenmod/filemanager/adapters/BookmarksAdapter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.adapters;
+package com.cyanogenmod.filemanager.adapters;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
@@ -27,11 +27,11 @@ import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.cyanogenmod.explorer.R;
-import com.cyanogenmod.explorer.model.Bookmark;
-import com.cyanogenmod.explorer.model.Bookmark.BOOKMARK_TYPE;
-import com.cyanogenmod.explorer.ui.IconHolder;
-import com.cyanogenmod.explorer.util.BookmarksHelper;
+import com.cyanogenmod.filemanager.R;
+import com.cyanogenmod.filemanager.model.Bookmark;
+import com.cyanogenmod.filemanager.model.Bookmark.BOOKMARK_TYPE;
+import com.cyanogenmod.filemanager.ui.IconHolder;
+import com.cyanogenmod.filemanager.util.BookmarksHelper;
 
 import java.util.List;
 
diff --git a/src/com/cyanogenmod/explorer/adapters/CheckableListAdapter.java b/src/com/cyanogenmod/filemanager/adapters/CheckableListAdapter.java
index b5435c88..47a210b5 100644
--- a/src/com/cyanogenmod/explorer/adapters/CheckableListAdapter.java
+++ b/src/com/cyanogenmod/filemanager/adapters/CheckableListAdapter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.adapters;
+package com.cyanogenmod.filemanager.adapters;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -24,7 +24,7 @@ import android.widget.ArrayAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.cyanogenmod.explorer.R;
+import com.cyanogenmod.filemanager.R;
 
 import java.util.List;
 
diff --git a/src/com/cyanogenmod/explorer/adapters/FileSystemObjectAdapter.java b/src/com/cyanogenmod/filemanager/adapters/FileSystemObjectAdapter.java
index 79e5e6bf..a8b627d9 100644
--- a/src/com/cyanogenmod/explorer/adapters/FileSystemObjectAdapter.java
+++ b/src/com/cyanogenmod/filemanager/adapters/FileSystemObjectAdapter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.adapters;
+package com.cyanogenmod.filemanager.adapters;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -28,12 +28,12 @@ import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.cyanogenmod.explorer.R;
-import com.cyanogenmod.explorer.model.FileSystemObject;
-import com.cyanogenmod.explorer.model.ParentDirectory;
-import com.cyanogenmod.explorer.ui.IconHolder;
-import com.cyanogenmod.explorer.util.FileHelper;
-import com.cyanogenmod.explorer.util.MimeTypeHelper;
+import com.cyanogenmod.filemanager.R;
+import com.cyanogenmod.filemanager.model.FileSystemObject;
+import com.cyanogenmod.filemanager.model.ParentDirectory;
+import com.cyanogenmod.filemanager.ui.IconHolder;
+import com.cyanogenmod.filemanager.util.FileHelper;
+import com.cyanogenmod.filemanager.util.MimeTypeHelper;
 
 import java.text.DateFormat;
 import java.util.ArrayList;
diff --git a/src/com/cyanogenmod/explorer/adapters/HighlightedSimpleMenuListAdapter.java b/src/com/cyanogenmod/filemanager/adapters/HighlightedSimpleMenuListAdapter.java
index b54bdf34..f2b50442 100644
--- a/src/com/cyanogenmod/explorer/adapters/HighlightedSimpleMenuListAdapter.java
+++ b/src/com/cyanogenmod/filemanager/adapters/HighlightedSimpleMenuListAdapter.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.adapters;
+package com.cyanogenmod.filemanager.adapters;
 
 import android.content.Context;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import com.cyanogenmod.explorer.R;
+import com.cyanogenmod.filemanager.R;
 
 /**
  * An implementation of {@link SimpleMenuListAdapter} with highlighted text
diff --git a/src/com/cyanogenmod/explorer/adapters/HistoryAdapter.java b/src/com/cyanogenmod/filemanager/adapters/HistoryAdapter.java
index 90789b5e..bceb0653 100644
--- a/src/com/cyanogenmod/explorer/adapters/HistoryAdapter.java
+++ b/src/com/cyanogenmod/filemanager/adapters/HistoryAdapter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.adapters;
+package com.cyanogenmod.filemanager.adapters;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
@@ -25,11 +25,11 @@ import android.widget.ArrayAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.cyanogenmod.explorer.R;
-import com.cyanogenmod.explorer.model.History;
-import com.cyanogenmod.explorer.parcelables.NavigationViewInfoParcelable;
-import com.cyanogenmod.explorer.parcelables.SearchInfoParcelable;
-import com.cyanogenmod.explorer.ui.IconHolder;
+import com.cyanogenmod.filemanager.R;
+import com.cyanogenmod.filemanager.model.History;
+import com.cyanogenmod.filemanager.parcelables.NavigationViewInfoParcelable;
+import com.cyanogenmod.filemanager.parcelables.SearchInfoParcelable;
+import com.cyanogenmod.filemanager.ui.IconHolder;
 
 import java.util.List;
 
diff --git a/src/com/cyanogenmod/explorer/adapters/MenuSettingsAdapter.java b/src/com/cyanogenmod/filemanager/adapters/MenuSettingsAdapter.java
index bd2614ee..b9bc1b6a 100644
--- a/src/com/cyanogenmod/explorer/adapters/MenuSettingsAdapter.java
+++ b/src/com/cyanogenmod/filemanager/adapters/MenuSettingsAdapter.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.adapters;
+package com.cyanogenmod.filemanager.adapters;
 
 import android.content.Context;
 import android.content.res.Resources;
 
-import com.cyanogenmod.explorer.preferences.ExplorerSettings;
-import com.cyanogenmod.explorer.preferences.ObjectIdentifier;
-import com.cyanogenmod.explorer.preferences.ObjectStringIdentifier;
-import com.cyanogenmod.explorer.preferences.Preferences;
-import com.cyanogenmod.explorer.util.ResourcesHelper;
+import com.cyanogenmod.filemanager.preferences.FileManagerSettings;
+import com.cyanogenmod.filemanager.preferences.ObjectIdentifier;
+import com.cyanogenmod.filemanager.preferences.ObjectStringIdentifier;
+import com.cyanogenmod.filemanager.preferences.Preferences;
+import com.cyanogenmod.filemanager.util.ResourcesHelper;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -54,7 +54,7 @@ public class MenuSettingsAdapter extends CheckableListAdapter {
             super();
         }
         int mId;
-        ExplorerSettings mSetting;
+        FileManagerSettings mSetting;
         CheckableListAdapter.CheckableItem mItem;
     }
 
@@ -66,8 +66,8 @@ public class MenuSettingsAdapter extends CheckableListAdapter {
      * @param context The current context
      * @param setting The setting to add to the current list
      */
-    public MenuSettingsAdapter(Context context, ExplorerSettings setting) {
-        this(context, Arrays.asList(new ExplorerSettings[]{setting}));
+    public MenuSettingsAdapter(Context context, FileManagerSettings setting) {
+        this(context, Arrays.asList(new FileManagerSettings[]{setting}));
         addSetting(context, setting);
     }
 
@@ -77,7 +77,7 @@ public class MenuSettingsAdapter extends CheckableListAdapter {
      * @param context The current context
      * @param settings An array of setting to add to the current list
      */
-    public MenuSettingsAdapter(Context context, List<ExplorerSettings> settings) {
+    public MenuSettingsAdapter(Context context, List<FileManagerSettings> settings) {
         super(context, new ArrayList<CheckableListAdapter.CheckableItem>());
 
         //Process the data
@@ -112,9 +112,9 @@ public class MenuSettingsAdapter extends CheckableListAdapter {
      * Method that returns the setting.
      *
      * @param position The position of the item
-     * @return ExplorerSettings The setting
+     * @return FileManagerSettings The setting
      */
-    public ExplorerSettings getSetting(int position) {
+    public FileManagerSettings getSetting(int position) {
         return this.mData.get(position).mSetting;
     }
 
@@ -124,7 +124,7 @@ public class MenuSettingsAdapter extends CheckableListAdapter {
      * @param context The current context
      * @param setting The setting to add to the current list
      */
-    private void addSetting(Context context, ExplorerSettings setting) {
+    private void addSetting(Context context, FileManagerSettings setting) {
         //Only 2 type of settings are allowed
         final Resources res = context.getResources();
         try {
@@ -226,7 +226,7 @@ public class MenuSettingsAdapter extends CheckableListAdapter {
      */
     @SuppressWarnings("static-method")
     private DataHolder createDataHolder(
-            int id, ExplorerSettings setting, String title, boolean selected) {
+            int id, FileManagerSettings setting, String title, boolean selected) {
         DataHolder dataHolder = new DataHolder();
         dataHolder.mId = id;
         dataHolder.mSetting = setting;
diff --git a/src/com/cyanogenmod/explorer/adapters/SearchResultAdapter.java b/src/com/cyanogenmod/filemanager/adapters/SearchResultAdapter.java
index c3f39689..94e626ba 100644
--- a/src/com/cyanogenmod/explorer/adapters/SearchResultAdapter.java
+++ b/src/com/cyanogenmod/filemanager/adapters/SearchResultAdapter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.adapters;
+package com.cyanogenmod.filemanager.adapters;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
@@ -27,16 +27,16 @@ import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.cyanogenmod.explorer.R;
-import com.cyanogenmod.explorer.model.FileSystemObject;
-import com.cyanogenmod.explorer.model.Query;
-import com.cyanogenmod.explorer.model.SearchResult;
-import com.cyanogenmod.explorer.preferences.ExplorerSettings;
-import com.cyanogenmod.explorer.preferences.Preferences;
-import com.cyanogenmod.explorer.ui.IconHolder;
-import com.cyanogenmod.explorer.ui.widgets.RelevanceView;
-import com.cyanogenmod.explorer.util.MimeTypeHelper;
-import com.cyanogenmod.explorer.util.SearchHelper;
+import com.cyanogenmod.filemanager.R;
+import com.cyanogenmod.filemanager.model.FileSystemObject;
+import com.cyanogenmod.filemanager.model.Query;
+import com.cyanogenmod.filemanager.model.SearchResult;
+import com.cyanogenmod.filemanager.preferences.FileManagerSettings;
+import com.cyanogenmod.filemanager.preferences.Preferences;
+import com.cyanogenmod.filemanager.ui.IconHolder;
+import com.cyanogenmod.filemanager.ui.widgets.RelevanceView;
+import com.cyanogenmod.filemanager.util.MimeTypeHelper;
+import com.cyanogenmod.filemanager.util.SearchHelper;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -136,12 +136,12 @@ public class SearchResultAdapter extends ArrayAdapter<SearchResult> implements O
 
         // Load settings
         this.mHighlightTerms = Preferences.getSharedPreferences().getBoolean(
-                ExplorerSettings.SETTINGS_HIGHLIGHT_TERMS.getId(),
-                ((Boolean)ExplorerSettings.SETTINGS_HIGHLIGHT_TERMS.
+                FileManagerSettings.SETTINGS_HIGHLIGHT_TERMS.getId(),
+                ((Boolean)FileManagerSettings.SETTINGS_HIGHLIGHT_TERMS.
                         getDefaultValue()).booleanValue());
         this.mShowRelevanceWidget = Preferences.getSharedPreferences().getBoolean(
-                ExplorerSettings.SETTINGS_SHOW_RELEVANCE_WIDGET.getId(),
-                ((Boolean)ExplorerSettings.SETTINGS_SHOW_RELEVANCE_WIDGET.
+                FileManagerSettings.SETTINGS_SHOW_RELEVANCE_WIDGET.getId(),
+                ((Boolean)FileManagerSettings.SETTINGS_SHOW_RELEVANCE_WIDGET.
                         getDefaultValue()).booleanValue());
 
         //Do cache of the data for better performance
diff --git a/src/com/cyanogenmod/explorer/adapters/SimpleMenuListAdapter.java b/src/com/cyanogenmod/filemanager/adapters/SimpleMenuListAdapter.java
index 159846d2..0dcd5661 100644
--- a/src/com/cyanogenmod/explorer/adapters/SimpleMenuListAdapter.java
+++ b/src/com/cyanogenmod/filemanager/adapters/SimpleMenuListAdapter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.adapters;
+package com.cyanogenmod.filemanager.adapters;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -27,7 +27,7 @@ import android.widget.BaseAdapter;
 import android.widget.TextView;
 
 import com.android.internal.view.menu.MenuBuilder;
-import com.cyanogenmod.explorer.R;
+import com.cyanogenmod.filemanager.R;
 
 /**
  * An implementation of {@link BaseAdapter} that is associated with a
diff --git a/src/com/cyanogenmod/explorer/adapters/TwoColumnsMenuListAdapter.java b/src/com/cyanogenmod/filemanager/adapters/TwoColumnsMenuListAdapter.java
index ad595a9b..819fb963 100644
--- a/src/com/cyanogenmod/explorer/adapters/TwoColumnsMenuListAdapter.java
+++ b/src/com/cyanogenmod/filemanager/adapters/TwoColumnsMenuListAdapter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.adapters;
+package com.cyanogenmod.filemanager.adapters;
 
 import android.content.Context;
 import android.view.Menu;
@@ -28,7 +28,7 @@ import android.widget.AdapterView.OnItemClickListener;
 import android.widget.AdapterView.OnItemLongClickListener;
 import android.widget.TextView;
 
-import com.cyanogenmod.explorer.R;
+import com.cyanogenmod.filemanager.R;
 
 /**
  * An implementation of {@link SimpleMenuListAdapter} for showing
diff --git a/src/com/cyanogenmod/explorer/commands/AsyncResultExecutable.java b/src/com/cyanogenmod/filemanager/commands/AsyncResultExecutable.java
index ed7301fb..c53aa192 100644
--- a/src/com/cyanogenmod/explorer/commands/AsyncResultExecutable.java
+++ b/src/com/cyanogenmod/filemanager/commands/AsyncResultExecutable.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands;
+package com.cyanogenmod.filemanager.commands;
 
 /**
  * An interface that defines a class as executable in an asynchronous way.
diff --git a/src/com/cyanogenmod/explorer/commands/AsyncResultListener.java b/src/com/cyanogenmod/filemanager/commands/AsyncResultListener.java
index be805401..847bd1a1 100644
--- a/src/com/cyanogenmod/explorer/commands/AsyncResultListener.java
+++ b/src/com/cyanogenmod/filemanager/commands/AsyncResultListener.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands;
+package com.cyanogenmod.filemanager.commands;
 
 
 /**
diff --git a/src/com/cyanogenmod/explorer/commands/ChangeCurrentDirExecutable.java b/src/com/cyanogenmod/filemanager/commands/ChangeCurrentDirExecutable.java
index b75b69b9..5999cfc7 100644
--- a/src/com/cyanogenmod/explorer/commands/ChangeCurrentDirExecutable.java
+++ b/src/com/cyanogenmod/filemanager/commands/ChangeCurrentDirExecutable.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands;
+package com.cyanogenmod.filemanager.commands;
 
 /**
  * An interface that represents an executable for retrieve the current directory.
diff --git a/src/com/cyanogenmod/explorer/commands/ChangeOwnerExecutable.java b/src/com/cyanogenmod/filemanager/commands/ChangeOwnerExecutable.java
index 3a76a3c3..9d0b9c35 100644
--- a/src/com/cyanogenmod/explorer/commands/ChangeOwnerExecutable.java
+++ b/src/com/cyanogenmod/filemanager/commands/ChangeOwnerExecutable.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands;
+package com.cyanogenmod.filemanager.commands;
 
 /**
  * An interface that represents an executable for change the owner of
diff --git a/src/com/cyanogenmod/explorer/commands/ChangePermissionsExecutable.java b/src/com/cyanogenmod/filemanager/commands/ChangePermissionsExecutable.java
index 99d6dd62..0cb2c844 100644
--- a/src/com/cyanogenmod/explorer/commands/ChangePermissionsExecutable.java
+++ b/src/com/cyanogenmod/filemanager/commands/ChangePermissionsExecutable.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands;
+package com.cyanogenmod.filemanager.commands;
 
 /**
  * An interface that represents an executable for change the permissions of
diff --git a/src/com/cyanogenmod/explorer/commands/CompressExecutable.java b/src/com/cyanogenmod/filemanager/commands/CompressExecutable.java
index 6f054311..af8ce543 100644
--- a/src/com/cyanogenmod/explorer/commands/CompressExecutable.java
+++ b/src/com/cyanogenmod/filemanager/commands/CompressExecutable.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands;
+package com.cyanogenmod.filemanager.commands;
 
 /**
  * An interface that represents an executable for compress file system objects.
diff --git a/src/com/cyanogenmod/explorer/commands/CopyExecutable.java b/src/com/cyanogenmod/filemanager/commands/CopyExecutable.java
index 989ca593..983d8444 100644
--- a/src/com/cyanogenmod/explorer/commands/CopyExecutable.java
+++ b/src/com/cyanogenmod/filemanager/commands/CopyExecutable.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands;
+package com.cyanogenmod.filemanager.commands;
 
 /**
  * An interface that represents an executable for copy a file system object to
diff --git a/src/com/cyanogenmod/explorer/commands/CreateDirExecutable.java b/src/com/cyanogenmod/filemanager/commands/CreateDirExecutable.java
index 33869ccf..40d490e0 100644
--- a/src/com/cyanogenmod/explorer/commands/CreateDirExecutable.java
+++ b/src/com/cyanogenmod/filemanager/commands/CreateDirExecutable.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands;
+package com.cyanogenmod.filemanager.commands;
 
 /**
  * An interface that represents an executable for create a new directory.
diff --git a/src/com/cyanogenmod/explorer/commands/CreateFileExecutable.java b/src/com/cyanogenmod/filemanager/commands/CreateFileExecutable.java
index 69d5bd9a..011aaf51 100644
--- a/src/com/cyanogenmod/explorer/commands/CreateFileExecutable.java
+++ b/src/com/cyanogenmod/filemanager/commands/CreateFileExecutable.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands;
+package com.cyanogenmod.filemanager.commands;
 
 /**
  * An interface that represents an executable for create a new file.
diff --git a/src/com/cyanogenmod/explorer/commands/CurrentDirExecutable.java b/src/com/cyanogenmod/filemanager/commands/CurrentDirExecutable.java
index 81149e16..1d951f88 100644
--- a/src/com/cyanogenmod/explorer/commands/CurrentDirExecutable.java
+++ b/src/com/cyanogenmod/filemanager/commands/CurrentDirExecutable.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands;
+package com.cyanogenmod.filemanager.commands;
 
 /**
  * An interface that represents an executable for retrieve the current directory.
diff --git a/src/com/cyanogenmod/explorer/commands/DeleteDirExecutable.java b/src/com/cyanogenmod/filemanager/commands/DeleteDirExecutable.java
index 0dcfa863..0f2ce04b 100644
--- a/src/com/cyanogenmod/explorer/commands/DeleteDirExecutable.java
+++ b/src/com/cyanogenmod/filemanager/commands/DeleteDirExecutable.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands;
+package com.cyanogenmod.filemanager.commands;
 
 /**
  * An interface that represents an executable for delete a new directory.
diff --git a/src/com/cyanogenmod/explorer/commands/DeleteFileExecutable.java b/src/com/cyanogenmod/filemanager/commands/DeleteFileExecutable.java
index c2374853..33a9f235 100644
--- a/src/com/cyanogenmod/explorer/commands/DeleteFileExecutable.java
+++ b/src/com/cyanogenmod/filemanager/commands/DeleteFileExecutable.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands;
+package com.cyanogenmod.filemanager.commands;
 
 /**
  * An interface that represents an executable for delete a new file.
diff --git a/src/com/cyanogenmod/explorer/commands/DiskUsageExecutable.java b/src/com/cyanogenmod/filemanager/commands/DiskUsageExecutable.java
index 92e2b026..31beb761 100644
--- a/src/com/cyanogenmod/explorer/commands/DiskUsageExecutable.java
+++ b/src/com/cyanogenmod/filemanager/commands/DiskUsageExecutable.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands;
+package com.cyanogenmod.filemanager.commands;
 
-import com.cyanogenmod.explorer.model.DiskUsage;
+import com.cyanogenmod.filemanager.model.DiskUsage;
 
 import java.util.List;
 
diff --git a/src/com/cyanogenmod/explorer/commands/EchoExecutable.java b/src/com/cyanogenmod/filemanager/commands/EchoExecutable.java
index 19996057..a1ff41b1 100644
--- a/src/com/cyanogenmod/explorer/commands/EchoExecutable.java
+++ b/src/com/cyanogenmod/filemanager/commands/EchoExecutable.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands;
+package com.cyanogenmod.filemanager.commands;
 
 /**
  * An interface that represents an executable for expanding environment variables
diff --git a/src/com/cyanogenmod/explorer/commands/ExecExecutable.java b/src/com/cyanogenmod/filemanager/commands/ExecExecutable.java
index 17450ba1..5cf67628 100644
--- a/src/com/cyanogenmod/explorer/commands/ExecExecutable.java
+++ b/src/com/cyanogenmod/filemanager/commands/ExecExecutable.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands;
+package com.cyanogenmod.filemanager.commands;
 
 /**
  * An interface that represents an executable for execute a command
diff --git a/src/com/cyanogenmod/explorer/commands/Executable.java b/src/com/cyanogenmod/filemanager/commands/Executable.java
index 72049b1c..874235d9 100644
--- a/src/com/cyanogenmod/explorer/commands/Executable.java
+++ b/src/com/cyanogenmod/filemanager/commands/Executable.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands;
+package com.cyanogenmod.filemanager.commands;
 
 /**
  * An interface that defines a class as executable.
diff --git a/src/com/cyanogenmod/explorer/commands/ExecutableCreator.java b/src/com/cyanogenmod/filemanager/commands/ExecutableCreator.java
index ce377ee0..630546f8 100644
--- a/src/com/cyanogenmod/explorer/commands/ExecutableCreator.java
+++ b/src/com/cyanogenmod/filemanager/commands/ExecutableCreator.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands;
+package com.cyanogenmod.filemanager.commands;
 
-import com.cyanogenmod.explorer.commands.ListExecutable.LIST_MODE;
-import com.cyanogenmod.explorer.console.CommandNotFoundException;
-import com.cyanogenmod.explorer.model.Group;
-import com.cyanogenmod.explorer.model.MountPoint;
-import com.cyanogenmod.explorer.model.Permissions;
-import com.cyanogenmod.explorer.model.Query;
-import com.cyanogenmod.explorer.model.User;
-import com.cyanogenmod.explorer.preferences.CompressionMode;
+import com.cyanogenmod.filemanager.commands.ListExecutable.LIST_MODE;
+import com.cyanogenmod.filemanager.console.CommandNotFoundException;
+import com.cyanogenmod.filemanager.model.Group;
+import com.cyanogenmod.filemanager.model.MountPoint;
+import com.cyanogenmod.filemanager.model.Permissions;
+import com.cyanogenmod.filemanager.model.Query;
+import com.cyanogenmod.filemanager.model.User;
+import com.cyanogenmod.filemanager.preferences.CompressionMode;
 
 /**
  * A interface that defines methods for create {@link Executable} objects.
@@ -202,7 +202,7 @@ public interface ExecutableCreator {
      * @throws CommandNotFoundException If the executable can't be created
      */
     GroupsExecutable createGroupsExecutable()
-            throws com.cyanogenmod.explorer.console.CommandNotFoundException;
+            throws com.cyanogenmod.filemanager.console.CommandNotFoundException;
 
     /**
      * Method that creates an executable for retrieve identity information of the current user.
diff --git a/src/com/cyanogenmod/explorer/commands/ExecutableFactory.java b/src/com/cyanogenmod/filemanager/commands/ExecutableFactory.java
index 3a48807e..32def5cb 100644
--- a/src/com/cyanogenmod/explorer/commands/ExecutableFactory.java
+++ b/src/com/cyanogenmod/filemanager/commands/ExecutableFactory.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands;
+package com.cyanogenmod.filemanager.commands;
 
 /**
  * A class that represents a factory for creating {@link Executable} objects.
diff --git a/src/com/cyanogenmod/explorer/commands/FindExecutable.java b/src/com/cyanogenmod/filemanager/commands/FindExecutable.java
index ad08716b..7bcee56f 100644
--- a/src/com/cyanogenmod/explorer/commands/FindExecutable.java
+++ b/src/com/cyanogenmod/filemanager/commands/FindExecutable.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands;
+package com.cyanogenmod.filemanager.commands;
 
 /**
  * An interface that represents an executable for make a search over
diff --git a/src/com/cyanogenmod/explorer/commands/FolderUsageExecutable.java b/src/com/cyanogenmod/filemanager/commands/FolderUsageExecutable.java
index f133dffa..d9e1253a 100644
--- a/src/com/cyanogenmod/explorer/commands/FolderUsageExecutable.java
+++ b/src/com/cyanogenmod/filemanager/commands/FolderUsageExecutable.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands;
+package com.cyanogenmod.filemanager.commands;
 
-import com.cyanogenmod.explorer.model.FolderUsage;
+import com.cyanogenmod.filemanager.model.FolderUsage;
 
 /**
  * An interface that represents an executable for retrieve a folder usage
diff --git a/src/com/cyanogenmod/explorer/commands/GroupsExecutable.java b/src/com/cyanogenmod/filemanager/commands/GroupsExecutable.java
index 6b176ce3..30615d7c 100644
--- a/src/com/cyanogenmod/explorer/commands/GroupsExecutable.java
+++ b/src/com/cyanogenmod/filemanager/commands/GroupsExecutable.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands;
+package com.cyanogenmod.filemanager.commands;
 
-import com.cyanogenmod.explorer.model.Group;
+import com.cyanogenmod.filemanager.model.Group;
 
 import java.util.List;
 
diff --git a/src/com/cyanogenmod/explorer/commands/IdentityExecutable.java b/src/com/cyanogenmod/filemanager/commands/IdentityExecutable.java
index d2156960..8508ef7b 100644
--- a/src/com/cyanogenmod/explorer/commands/IdentityExecutable.java
+++ b/src/com/cyanogenmod/filemanager/commands/IdentityExecutable.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands;
+package com.cyanogenmod.filemanager.commands;
 
-import com.cyanogenmod.explorer.model.Identity;
+import com.cyanogenmod.filemanager.model.Identity;
 
 /**
  * An interface that represents an executable for retrieve information of
diff --git a/src/com/cyanogenmod/explorer/commands/LinkExecutable.java b/src/com/cyanogenmod/filemanager/commands/LinkExecutable.java
index 1064dfa9..53833ee9 100644
--- a/src/com/cyanogenmod/explorer/commands/LinkExecutable.java
+++ b/src/com/cyanogenmod/filemanager/commands/LinkExecutable.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands;
+package com.cyanogenmod.filemanager.commands;
 
 /**
  * An interface that represents an executable for create symlinks to other file system objects.
diff --git a/src/com/cyanogenmod/explorer/commands/ListExecutable.java b/src/com/cyanogenmod/filemanager/commands/ListExecutable.java
index 4607179a..07117790 100644
--- a/src/com/cyanogenmod/explorer/commands/ListExecutable.java
+++ b/src/com/cyanogenmod/filemanager/commands/ListExecutable.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands;
+package com.cyanogenmod.filemanager.commands;
 
-import com.cyanogenmod.explorer.model.FileSystemObject;
+import com.cyanogenmod.filemanager.model.FileSystemObject;
 
 import java.util.List;
 
diff --git a/src/com/cyanogenmod/explorer/commands/MountExecutable.java b/src/com/cyanogenmod/filemanager/commands/MountExecutable.java
index 99190ff9..1e6b2ca1 100644
--- a/src/com/cyanogenmod/explorer/commands/MountExecutable.java
+++ b/src/com/cyanogenmod/filemanager/commands/MountExecutable.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands;
+package com.cyanogenmod.filemanager.commands;
 
 /**
  * An interface that represents an executable for mount filesystems.
diff --git a/src/com/cyanogenmod/explorer/commands/MountPointInfoExecutable.java b/src/com/cyanogenmod/filemanager/commands/MountPointInfoExecutable.java
index 1cd233ca..af0ce5e5 100644
--- a/src/com/cyanogenmod/explorer/commands/MountPointInfoExecutable.java
+++ b/src/com/cyanogenmod/filemanager/commands/MountPointInfoExecutable.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands;
+package com.cyanogenmod.filemanager.commands;
 
-import com.cyanogenmod.explorer.model.MountPoint;
+import com.cyanogenmod.filemanager.model.MountPoint;
 
 import java.util.List;
 
diff --git a/src/com/cyanogenmod/explorer/commands/MoveExecutable.java b/src/com/cyanogenmod/filemanager/commands/MoveExecutable.java
index e6e4ea49..4d9bb2a1 100644
--- a/src/com/cyanogenmod/explorer/commands/MoveExecutable.java
+++ b/src/com/cyanogenmod/filemanager/commands/MoveExecutable.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands;
+package com.cyanogenmod.filemanager.commands;
 
 /**
  * An interface that represents an executable for move a file system object to
diff --git a/src/com/cyanogenmod/explorer/commands/ParentDirExecutable.java b/src/com/cyanogenmod/filemanager/commands/ParentDirExecutable.java
index 1c61875b..71f1ea7b 100644
--- a/src/com/cyanogenmod/explorer/commands/ParentDirExecutable.java
+++ b/src/com/cyanogenmod/filemanager/commands/ParentDirExecutable.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands;
+package com.cyanogenmod.filemanager.commands;
 
 /**
  * An interface that represents an executable for retrieve the parent directory of
diff --git a/src/com/cyanogenmod/explorer/commands/ProcessIdExecutable.java b/src/com/cyanogenmod/filemanager/commands/ProcessIdExecutable.java
index 192a0ee2..cbcbce3c 100644
--- a/src/com/cyanogenmod/explorer/commands/ProcessIdExecutable.java
+++ b/src/com/cyanogenmod/filemanager/commands/ProcessIdExecutable.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands;
+package com.cyanogenmod.filemanager.commands;
 
 /**
  * An interface that represents an executable for retrieve the process identifier
diff --git a/src/com/cyanogenmod/explorer/commands/QuickFolderSearchExecutable.java b/src/com/cyanogenmod/filemanager/commands/QuickFolderSearchExecutable.java
index b2bba8d9..54b0bda2 100644
--- a/src/com/cyanogenmod/explorer/commands/QuickFolderSearchExecutable.java
+++ b/src/com/cyanogenmod/filemanager/commands/QuickFolderSearchExecutable.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands;
+package com.cyanogenmod.filemanager.commands;
 
 import java.util.List;
 
diff --git a/src/com/cyanogenmod/explorer/commands/ReadExecutable.java b/src/com/cyanogenmod/filemanager/commands/ReadExecutable.java
index d5a90d41..475eb5c1 100644
--- a/src/com/cyanogenmod/explorer/commands/ReadExecutable.java
+++ b/src/com/cyanogenmod/filemanager/commands/ReadExecutable.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands;
+package com.cyanogenmod.filemanager.commands;
 
 /**
  * An interface that represents an executable for read files.
diff --git a/src/com/cyanogenmod/explorer/commands/ResolveLinkExecutable.java b/src/com/cyanogenmod/filemanager/commands/ResolveLinkExecutable.java
index ffc41d90..a5a2e638 100644
--- a/src/com/cyanogenmod/explorer/commands/ResolveLinkExecutable.java
+++ b/src/com/cyanogenmod/filemanager/commands/ResolveLinkExecutable.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands;
+package com.cyanogenmod.filemanager.commands;
 
-import com.cyanogenmod.explorer.model.FileSystemObject;
+import com.cyanogenmod.filemanager.model.FileSystemObject;
 
 /**
  * An interface that represents an executable for resolves the real
diff --git a/src/com/cyanogenmod/explorer/commands/SIGNAL.java b/src/com/cyanogenmod/filemanager/commands/SIGNAL.java
index fd349e1a..26bcaa03 100644
--- a/src/com/cyanogenmod/explorer/commands/SIGNAL.java
+++ b/src/com/cyanogenmod/filemanager/commands/SIGNAL.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands;
+package com.cyanogenmod.filemanager.commands;
 
 /**
  * An enumeration of allow signals that can send to programs.
diff --git a/src/com/cyanogenmod/explorer/commands/SendSignalExecutable.java b/src/com/cyanogenmod/filemanager/commands/SendSignalExecutable.java
index 4c74bbf9..076f7098 100644
--- a/src/com/cyanogenmod/explorer/commands/SendSignalExecutable.java
+++ b/src/com/cyanogenmod/filemanager/commands/SendSignalExecutable.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands;
+package com.cyanogenmod.filemanager.commands;
 
 /**
  * An interface that represents an executable for send signal to processes.
diff --git a/src/com/cyanogenmod/explorer/commands/SyncResultExecutable.java b/src/com/cyanogenmod/filemanager/commands/SyncResultExecutable.java
index 7e02dfa6..bfe51f6c 100644
--- a/src/com/cyanogenmod/explorer/commands/SyncResultExecutable.java
+++ b/src/com/cyanogenmod/filemanager/commands/SyncResultExecutable.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands;
+package com.cyanogenmod.filemanager.commands;
 
 /**
  * An interface that defines a class as executable in a synchronous way.
diff --git a/src/com/cyanogenmod/explorer/commands/UncompressExecutable.java b/src/com/cyanogenmod/filemanager/commands/UncompressExecutable.java
index aa9358ae..3a2b21cc 100644
--- a/src/com/cyanogenmod/explorer/commands/UncompressExecutable.java
+++ b/src/com/cyanogenmod/filemanager/commands/UncompressExecutable.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands;
+package com.cyanogenmod.filemanager.commands;
 
 /**
  * An interface that represents an executable for uncompress file system objects.
diff --git a/src/com/cyanogenmod/explorer/commands/WritableExecutable.java b/src/com/cyanogenmod/filemanager/commands/WritableExecutable.java
index cf3e24fd..111b2575 100644
--- a/src/com/cyanogenmod/explorer/commands/WritableExecutable.java
+++ b/src/com/cyanogenmod/filemanager/commands/WritableExecutable.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands;
+package com.cyanogenmod.filemanager.commands;
 
-import com.cyanogenmod.explorer.model.MountPoint;
+import com.cyanogenmod.filemanager.model.MountPoint;
 
 /**
  * An interface that represents an executable that writes in a filesystem.<br/>
diff --git a/src/com/cyanogenmod/explorer/commands/WriteExecutable.java b/src/com/cyanogenmod/filemanager/commands/WriteExecutable.java
index 50d37df8..1b4bc4b5 100644
--- a/src/com/cyanogenmod/explorer/commands/WriteExecutable.java
+++ b/src/com/cyanogenmod/filemanager/commands/WriteExecutable.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands;
+package com.cyanogenmod.filemanager.commands;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/src/com/cyanogenmod/explorer/commands/java/ChangeCurrentDirCommand.java b/src/com/cyanogenmod/filemanager/commands/java/ChangeCurrentDirCommand.java
index 98112185..476d4041 100644
--- a/src/com/cyanogenmod/explorer/commands/java/ChangeCurrentDirCommand.java
+++ b/src/com/cyanogenmod/filemanager/commands/java/ChangeCurrentDirCommand.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.java;
+package com.cyanogenmod.filemanager.commands.java;
 
 import android.util.Log;
 
-import com.cyanogenmod.explorer.commands.ChangeCurrentDirExecutable;
-import com.cyanogenmod.explorer.console.ExecutionException;
-import com.cyanogenmod.explorer.console.InsufficientPermissionsException;
-import com.cyanogenmod.explorer.console.NoSuchFileOrDirectory;
-import com.cyanogenmod.explorer.console.java.JavaConsole;
+import com.cyanogenmod.filemanager.commands.ChangeCurrentDirExecutable;
+import com.cyanogenmod.filemanager.console.ExecutionException;
+import com.cyanogenmod.filemanager.console.InsufficientPermissionsException;
+import com.cyanogenmod.filemanager.console.NoSuchFileOrDirectory;
+import com.cyanogenmod.filemanager.console.java.JavaConsole;
 
 import java.io.File;
 
diff --git a/src/com/cyanogenmod/explorer/commands/java/CopyCommand.java b/src/com/cyanogenmod/filemanager/commands/java/CopyCommand.java
index 53a8e68f..befea638 100644
--- a/src/com/cyanogenmod/explorer/commands/java/CopyCommand.java
+++ b/src/com/cyanogenmod/filemanager/commands/java/CopyCommand.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.java;
+package com.cyanogenmod.filemanager.commands.java;
 
 import android.util.Log;
 
-import com.cyanogenmod.explorer.commands.CopyExecutable;
-import com.cyanogenmod.explorer.console.ExecutionException;
-import com.cyanogenmod.explorer.console.InsufficientPermissionsException;
-import com.cyanogenmod.explorer.console.NoSuchFileOrDirectory;
-import com.cyanogenmod.explorer.model.MountPoint;
-import com.cyanogenmod.explorer.util.MountPointHelper;
+import com.cyanogenmod.filemanager.commands.CopyExecutable;
+import com.cyanogenmod.filemanager.console.ExecutionException;
+import com.cyanogenmod.filemanager.console.InsufficientPermissionsException;
+import com.cyanogenmod.filemanager.console.NoSuchFileOrDirectory;
+import com.cyanogenmod.filemanager.model.MountPoint;
+import com.cyanogenmod.filemanager.util.MountPointHelper;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
diff --git a/src/com/cyanogenmod/explorer/commands/java/CreateDirCommand.java b/src/com/cyanogenmod/filemanager/commands/java/CreateDirCommand.java
index ffd24f98..749134c8 100644
--- a/src/com/cyanogenmod/explorer/commands/java/CreateDirCommand.java
+++ b/src/com/cyanogenmod/filemanager/commands/java/CreateDirCommand.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.java;
+package com.cyanogenmod.filemanager.commands.java;
 
 import android.util.Log;
 
-import com.cyanogenmod.explorer.commands.CreateDirExecutable;
-import com.cyanogenmod.explorer.console.ExecutionException;
-import com.cyanogenmod.explorer.console.InsufficientPermissionsException;
-import com.cyanogenmod.explorer.console.NoSuchFileOrDirectory;
-import com.cyanogenmod.explorer.model.MountPoint;
-import com.cyanogenmod.explorer.util.MountPointHelper;
+import com.cyanogenmod.filemanager.commands.CreateDirExecutable;
+import com.cyanogenmod.filemanager.console.ExecutionException;
+import com.cyanogenmod.filemanager.console.InsufficientPermissionsException;
+import com.cyanogenmod.filemanager.console.NoSuchFileOrDirectory;
+import com.cyanogenmod.filemanager.model.MountPoint;
+import com.cyanogenmod.filemanager.util.MountPointHelper;
 
 import java.io.File;
 
diff --git a/src/com/cyanogenmod/explorer/commands/java/CreateFileCommand.java b/src/com/cyanogenmod/filemanager/commands/java/CreateFileCommand.java
index b6726e34..fa9b5bff 100644
--- a/src/com/cyanogenmod/explorer/commands/java/CreateFileCommand.java
+++ b/src/com/cyanogenmod/filemanager/commands/java/CreateFileCommand.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.java;
+package com.cyanogenmod.filemanager.commands.java;
 
 import android.util.Log;
 
-import com.cyanogenmod.explorer.commands.CreateFileExecutable;
-import com.cyanogenmod.explorer.console.ExecutionException;
-import com.cyanogenmod.explorer.console.InsufficientPermissionsException;
-import com.cyanogenmod.explorer.console.NoSuchFileOrDirectory;
-import com.cyanogenmod.explorer.model.MountPoint;
-import com.cyanogenmod.explorer.util.MountPointHelper;
+import com.cyanogenmod.filemanager.commands.CreateFileExecutable;
+import com.cyanogenmod.filemanager.console.ExecutionException;
+import com.cyanogenmod.filemanager.console.InsufficientPermissionsException;
+import com.cyanogenmod.filemanager.console.NoSuchFileOrDirectory;
+import com.cyanogenmod.filemanager.model.MountPoint;
+import com.cyanogenmod.filemanager.util.MountPointHelper;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/src/com/cyanogenmod/explorer/commands/java/CurrentDirCommand.java b/src/com/cyanogenmod/filemanager/commands/java/CurrentDirCommand.java
index 951c074e..8ba8dd8f 100644
--- a/src/com/cyanogenmod/explorer/commands/java/CurrentDirCommand.java
+++ b/src/com/cyanogenmod/filemanager/commands/java/CurrentDirCommand.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.java;
+package com.cyanogenmod.filemanager.commands.java;
 
 import android.util.Log;
 
-import com.cyanogenmod.explorer.commands.CurrentDirExecutable;
-import com.cyanogenmod.explorer.console.ExecutionException;
-import com.cyanogenmod.explorer.console.InsufficientPermissionsException;
-import com.cyanogenmod.explorer.console.NoSuchFileOrDirectory;
-import com.cyanogenmod.explorer.console.java.JavaConsole;
+import com.cyanogenmod.filemanager.commands.CurrentDirExecutable;
+import com.cyanogenmod.filemanager.console.ExecutionException;
+import com.cyanogenmod.filemanager.console.InsufficientPermissionsException;
+import com.cyanogenmod.filemanager.console.NoSuchFileOrDirectory;
+import com.cyanogenmod.filemanager.console.java.JavaConsole;
 
 
 /**
diff --git a/src/com/cyanogenmod/explorer/commands/java/DeleteDirCommand.java b/src/com/cyanogenmod/filemanager/commands/java/DeleteDirCommand.java
index ef52e6a2..3af8c90e 100644
--- a/src/com/cyanogenmod/explorer/commands/java/DeleteDirCommand.java
+++ b/src/com/cyanogenmod/filemanager/commands/java/DeleteDirCommand.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.java;
+package com.cyanogenmod.filemanager.commands.java;
 
 import android.util.Log;
 
-import com.cyanogenmod.explorer.commands.DeleteDirExecutable;
-import com.cyanogenmod.explorer.console.ExecutionException;
-import com.cyanogenmod.explorer.console.InsufficientPermissionsException;
-import com.cyanogenmod.explorer.console.NoSuchFileOrDirectory;
-import com.cyanogenmod.explorer.model.MountPoint;
-import com.cyanogenmod.explorer.util.MountPointHelper;
+import com.cyanogenmod.filemanager.commands.DeleteDirExecutable;
+import com.cyanogenmod.filemanager.console.ExecutionException;
+import com.cyanogenmod.filemanager.console.InsufficientPermissionsException;
+import com.cyanogenmod.filemanager.console.NoSuchFileOrDirectory;
+import com.cyanogenmod.filemanager.model.MountPoint;
+import com.cyanogenmod.filemanager.util.MountPointHelper;
 
 import java.io.File;
 
diff --git a/src/com/cyanogenmod/explorer/commands/java/DeleteFileCommand.java b/src/com/cyanogenmod/filemanager/commands/java/DeleteFileCommand.java
index 8cdef53c..8b6505ae 100644
--- a/src/com/cyanogenmod/explorer/commands/java/DeleteFileCommand.java
+++ b/src/com/cyanogenmod/filemanager/commands/java/DeleteFileCommand.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.java;
+package com.cyanogenmod.filemanager.commands.java;
 
 import android.util.Log;
 
-import com.cyanogenmod.explorer.commands.DeleteFileExecutable;
-import com.cyanogenmod.explorer.console.ExecutionException;
-import com.cyanogenmod.explorer.console.InsufficientPermissionsException;
-import com.cyanogenmod.explorer.console.NoSuchFileOrDirectory;
-import com.cyanogenmod.explorer.model.MountPoint;
-import com.cyanogenmod.explorer.util.MountPointHelper;
+import com.cyanogenmod.filemanager.commands.DeleteFileExecutable;
+import com.cyanogenmod.filemanager.console.ExecutionException;
+import com.cyanogenmod.filemanager.console.InsufficientPermissionsException;
+import com.cyanogenmod.filemanager.console.NoSuchFileOrDirectory;
+import com.cyanogenmod.filemanager.model.MountPoint;
+import com.cyanogenmod.filemanager.util.MountPointHelper;
 
 import java.io.File;
 
diff --git a/src/com/cyanogenmod/explorer/commands/java/DiskUsageCommand.java b/src/com/cyanogenmod/filemanager/commands/java/DiskUsageCommand.java
index b9e67e12..133de0d4 100644
--- a/src/com/cyanogenmod/explorer/commands/java/DiskUsageCommand.java
+++ b/src/com/cyanogenmod/filemanager/commands/java/DiskUsageCommand.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.java;
+package com.cyanogenmod.filemanager.commands.java;
 
 import android.util.Log;
 
-import com.cyanogenmod.explorer.commands.DiskUsageExecutable;
-import com.cyanogenmod.explorer.console.ExecutionException;
-import com.cyanogenmod.explorer.console.InsufficientPermissionsException;
-import com.cyanogenmod.explorer.console.NoSuchFileOrDirectory;
-import com.cyanogenmod.explorer.model.DiskUsage;
-import com.cyanogenmod.explorer.model.MountPoint;
+import com.cyanogenmod.filemanager.commands.DiskUsageExecutable;
+import com.cyanogenmod.filemanager.console.ExecutionException;
+import com.cyanogenmod.filemanager.console.InsufficientPermissionsException;
+import com.cyanogenmod.filemanager.console.NoSuchFileOrDirectory;
+import com.cyanogenmod.filemanager.model.DiskUsage;
+import com.cyanogenmod.filemanager.model.MountPoint;
 
 import java.io.File;
 import java.util.ArrayList;
diff --git a/src/com/cyanogenmod/explorer/commands/java/FindCommand.java b/src/com/cyanogenmod/filemanager/commands/java/FindCommand.java
index 37027c74..17e011e8 100644
--- a/src/com/cyanogenmod/explorer/commands/java/FindCommand.java
+++ b/src/com/cyanogenmod/filemanager/commands/java/FindCommand.java
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.java;
+package com.cyanogenmod.filemanager.commands.java;
 
 import android.content.Context;
 import android.util.Log;
 
-import com.cyanogenmod.explorer.commands.AsyncResultListener;
-import com.cyanogenmod.explorer.commands.FindExecutable;
-import com.cyanogenmod.explorer.console.ExecutionException;
-import com.cyanogenmod.explorer.console.InsufficientPermissionsException;
-import com.cyanogenmod.explorer.console.NoSuchFileOrDirectory;
-import com.cyanogenmod.explorer.model.FileSystemObject;
-import com.cyanogenmod.explorer.model.Query;
-import com.cyanogenmod.explorer.util.FileHelper;
-import com.cyanogenmod.explorer.util.SearchHelper;
+import com.cyanogenmod.filemanager.commands.AsyncResultListener;
+import com.cyanogenmod.filemanager.commands.FindExecutable;
+import com.cyanogenmod.filemanager.console.ExecutionException;
+import com.cyanogenmod.filemanager.console.InsufficientPermissionsException;
+import com.cyanogenmod.filemanager.console.NoSuchFileOrDirectory;
+import com.cyanogenmod.filemanager.model.FileSystemObject;
+import com.cyanogenmod.filemanager.model.Query;
+import com.cyanogenmod.filemanager.util.FileHelper;
+import com.cyanogenmod.filemanager.util.SearchHelper;
 
 import java.io.File;
 import java.util.Arrays;
diff --git a/src/com/cyanogenmod/explorer/commands/java/FolderUsageCommand.java b/src/com/cyanogenmod/filemanager/commands/java/FolderUsageCommand.java
index 9aa711c4..c201dfbd 100644
--- a/src/com/cyanogenmod/explorer/commands/java/FolderUsageCommand.java
+++ b/src/com/cyanogenmod/filemanager/commands/java/FolderUsageCommand.java
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.java;
+package com.cyanogenmod.filemanager.commands.java;
 
 import android.util.Log;
 
-import com.cyanogenmod.explorer.commands.AsyncResultListener;
-import com.cyanogenmod.explorer.commands.FolderUsageExecutable;
-import com.cyanogenmod.explorer.console.ExecutionException;
-import com.cyanogenmod.explorer.console.InsufficientPermissionsException;
-import com.cyanogenmod.explorer.console.NoSuchFileOrDirectory;
-import com.cyanogenmod.explorer.model.FolderUsage;
-import com.cyanogenmod.explorer.util.MimeTypeHelper;
-import com.cyanogenmod.explorer.util.MimeTypeHelper.MimeTypeCategory;
+import com.cyanogenmod.filemanager.commands.AsyncResultListener;
+import com.cyanogenmod.filemanager.commands.FolderUsageExecutable;
+import com.cyanogenmod.filemanager.console.ExecutionException;
+import com.cyanogenmod.filemanager.console.InsufficientPermissionsException;
+import com.cyanogenmod.filemanager.console.NoSuchFileOrDirectory;
+import com.cyanogenmod.filemanager.model.FolderUsage;
+import com.cyanogenmod.filemanager.util.MimeTypeHelper;
+import com.cyanogenmod.filemanager.util.MimeTypeHelper.MimeTypeCategory;
 
 import java.io.File;
 
diff --git a/src/com/cyanogenmod/explorer/commands/java/JavaExecutableCreator.java b/src/com/cyanogenmod/filemanager/commands/java/JavaExecutableCreator.java
index d6d06dfc..b43fe7a1 100644
--- a/src/com/cyanogenmod/explorer/commands/java/JavaExecutableCreator.java
+++ b/src/com/cyanogenmod/filemanager/commands/java/JavaExecutableCreator.java
@@ -14,51 +14,51 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.java;
-
-import com.cyanogenmod.explorer.R;
-import com.cyanogenmod.explorer.commands.AsyncResultListener;
-import com.cyanogenmod.explorer.commands.ChangeCurrentDirExecutable;
-import com.cyanogenmod.explorer.commands.ChangeOwnerExecutable;
-import com.cyanogenmod.explorer.commands.ChangePermissionsExecutable;
-import com.cyanogenmod.explorer.commands.CompressExecutable;
-import com.cyanogenmod.explorer.commands.CopyExecutable;
-import com.cyanogenmod.explorer.commands.CreateDirExecutable;
-import com.cyanogenmod.explorer.commands.CreateFileExecutable;
-import com.cyanogenmod.explorer.commands.CurrentDirExecutable;
-import com.cyanogenmod.explorer.commands.DeleteDirExecutable;
-import com.cyanogenmod.explorer.commands.DeleteFileExecutable;
-import com.cyanogenmod.explorer.commands.DiskUsageExecutable;
-import com.cyanogenmod.explorer.commands.EchoExecutable;
-import com.cyanogenmod.explorer.commands.ExecExecutable;
-import com.cyanogenmod.explorer.commands.ExecutableCreator;
-import com.cyanogenmod.explorer.commands.FindExecutable;
-import com.cyanogenmod.explorer.commands.FolderUsageExecutable;
-import com.cyanogenmod.explorer.commands.GroupsExecutable;
-import com.cyanogenmod.explorer.commands.IdentityExecutable;
-import com.cyanogenmod.explorer.commands.LinkExecutable;
-import com.cyanogenmod.explorer.commands.ListExecutable;
-import com.cyanogenmod.explorer.commands.ListExecutable.LIST_MODE;
-import com.cyanogenmod.explorer.commands.MountExecutable;
-import com.cyanogenmod.explorer.commands.MountPointInfoExecutable;
-import com.cyanogenmod.explorer.commands.MoveExecutable;
-import com.cyanogenmod.explorer.commands.ParentDirExecutable;
-import com.cyanogenmod.explorer.commands.ProcessIdExecutable;
-import com.cyanogenmod.explorer.commands.QuickFolderSearchExecutable;
-import com.cyanogenmod.explorer.commands.ReadExecutable;
-import com.cyanogenmod.explorer.commands.ResolveLinkExecutable;
-import com.cyanogenmod.explorer.commands.SIGNAL;
-import com.cyanogenmod.explorer.commands.SendSignalExecutable;
-import com.cyanogenmod.explorer.commands.UncompressExecutable;
-import com.cyanogenmod.explorer.commands.WriteExecutable;
-import com.cyanogenmod.explorer.console.CommandNotFoundException;
-import com.cyanogenmod.explorer.console.java.JavaConsole;
-import com.cyanogenmod.explorer.model.Group;
-import com.cyanogenmod.explorer.model.MountPoint;
-import com.cyanogenmod.explorer.model.Permissions;
-import com.cyanogenmod.explorer.model.Query;
-import com.cyanogenmod.explorer.model.User;
-import com.cyanogenmod.explorer.preferences.CompressionMode;
+package com.cyanogenmod.filemanager.commands.java;
+
+import com.cyanogenmod.filemanager.R;
+import com.cyanogenmod.filemanager.commands.AsyncResultListener;
+import com.cyanogenmod.filemanager.commands.ChangeCurrentDirExecutable;
+import com.cyanogenmod.filemanager.commands.ChangeOwnerExecutable;
+import com.cyanogenmod.filemanager.commands.ChangePermissionsExecutable;
+import com.cyanogenmod.filemanager.commands.CompressExecutable;
+import com.cyanogenmod.filemanager.commands.CopyExecutable;
+import com.cyanogenmod.filemanager.commands.CreateDirExecutable;
+import com.cyanogenmod.filemanager.commands.CreateFileExecutable;
+import com.cyanogenmod.filemanager.commands.CurrentDirExecutable;
+import com.cyanogenmod.filemanager.commands.DeleteDirExecutable;
+import com.cyanogenmod.filemanager.commands.DeleteFileExecutable;
+import com.cyanogenmod.filemanager.commands.DiskUsageExecutable;
+import com.cyanogenmod.filemanager.commands.EchoExecutable;
+import com.cyanogenmod.filemanager.commands.ExecExecutable;
+import com.cyanogenmod.filemanager.commands.ExecutableCreator;
+import com.cyanogenmod.filemanager.commands.FindExecutable;
+import com.cyanogenmod.filemanager.commands.FolderUsageExecutable;
+import com.cyanogenmod.filemanager.commands.GroupsExecutable;
+import com.cyanogenmod.filemanager.commands.IdentityExecutable;
+import com.cyanogenmod.filemanager.commands.LinkExecutable;
+import com.cyanogenmod.filemanager.commands.ListExecutable;
+import com.cyanogenmod.filemanager.commands.ListExecutable.LIST_MODE;
+import com.cyanogenmod.filemanager.commands.MountExecutable;
+import com.cyanogenmod.filemanager.commands.MountPointInfoExecutable;
+import com.cyanogenmod.filemanager.commands.MoveExecutable;
+import com.cyanogenmod.filemanager.commands.ParentDirExecutable;
+import com.cyanogenmod.filemanager.commands.ProcessIdExecutable;
+import com.cyanogenmod.filemanager.commands.QuickFolderSearchExecutable;
+import com.cyanogenmod.filemanager.commands.ReadExecutable;
+import com.cyanogenmod.filemanager.commands.ResolveLinkExecutable;
+import com.cyanogenmod.filemanager.commands.SIGNAL;
+import com.cyanogenmod.filemanager.commands.SendSignalExecutable;
+import com.cyanogenmod.filemanager.commands.UncompressExecutable;
+import com.cyanogenmod.filemanager.commands.WriteExecutable;
+import com.cyanogenmod.filemanager.console.CommandNotFoundException;
+import com.cyanogenmod.filemanager.console.java.JavaConsole;
+import com.cyanogenmod.filemanager.model.Group;
+import com.cyanogenmod.filemanager.model.MountPoint;
+import com.cyanogenmod.filemanager.model.Permissions;
+import com.cyanogenmod.filemanager.model.Query;
+import com.cyanogenmod.filemanager.model.User;
+import com.cyanogenmod.filemanager.preferences.CompressionMode;
 
 /**
  * A class for create shell {@link "Executable"} objects.
diff --git a/src/com/cyanogenmod/explorer/commands/java/JavaExecutableFactory.java b/src/com/cyanogenmod/filemanager/commands/java/JavaExecutableFactory.java
index 1fc2734b..0220e0ff 100644
--- a/src/com/cyanogenmod/explorer/commands/java/JavaExecutableFactory.java
+++ b/src/com/cyanogenmod/filemanager/commands/java/JavaExecutableFactory.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.java;
+package com.cyanogenmod.filemanager.commands.java;
 
-import com.cyanogenmod.explorer.commands.ExecutableCreator;
-import com.cyanogenmod.explorer.commands.ExecutableFactory;
-import com.cyanogenmod.explorer.console.java.JavaConsole;
+import com.cyanogenmod.filemanager.commands.ExecutableCreator;
+import com.cyanogenmod.filemanager.commands.ExecutableFactory;
+import com.cyanogenmod.filemanager.console.java.JavaConsole;
 /**
  * A class that represents a factory for creating java {@link "Executable"} objects.
  */
diff --git a/src/com/cyanogenmod/explorer/commands/java/ListCommand.java b/src/com/cyanogenmod/filemanager/commands/java/ListCommand.java
index 27311348..8f1a766e 100644
--- a/src/com/cyanogenmod/explorer/commands/java/ListCommand.java
+++ b/src/com/cyanogenmod/filemanager/commands/java/ListCommand.java
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.java;
+package com.cyanogenmod.filemanager.commands.java;
 
 import android.content.Context;
 import android.util.Log;
 
-import com.cyanogenmod.explorer.commands.ListExecutable;
-import com.cyanogenmod.explorer.console.ExecutionException;
-import com.cyanogenmod.explorer.console.InsufficientPermissionsException;
-import com.cyanogenmod.explorer.console.NoSuchFileOrDirectory;
-import com.cyanogenmod.explorer.model.FileSystemObject;
-import com.cyanogenmod.explorer.model.ParentDirectory;
-import com.cyanogenmod.explorer.util.FileHelper;
+import com.cyanogenmod.filemanager.commands.ListExecutable;
+import com.cyanogenmod.filemanager.console.ExecutionException;
+import com.cyanogenmod.filemanager.console.InsufficientPermissionsException;
+import com.cyanogenmod.filemanager.console.NoSuchFileOrDirectory;
+import com.cyanogenmod.filemanager.model.FileSystemObject;
+import com.cyanogenmod.filemanager.model.ParentDirectory;
+import com.cyanogenmod.filemanager.util.FileHelper;
 
 import java.io.File;
 import java.util.ArrayList;
diff --git a/src/com/cyanogenmod/explorer/commands/java/MountPointInfoCommand.java b/src/com/cyanogenmod/filemanager/commands/java/MountPointInfoCommand.java
index f7c6b6ff..ecd8a815 100644
--- a/src/com/cyanogenmod/explorer/commands/java/MountPointInfoCommand.java
+++ b/src/com/cyanogenmod/filemanager/commands/java/MountPointInfoCommand.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.java;
+package com.cyanogenmod.filemanager.commands.java;
 
 import android.util.Log;
 
-import com.cyanogenmod.explorer.commands.MountPointInfoExecutable;
-import com.cyanogenmod.explorer.console.ExecutionException;
-import com.cyanogenmod.explorer.console.InsufficientPermissionsException;
-import com.cyanogenmod.explorer.console.NoSuchFileOrDirectory;
-import com.cyanogenmod.explorer.model.MountPoint;
-import com.cyanogenmod.explorer.util.ParseHelper;
+import com.cyanogenmod.filemanager.commands.MountPointInfoExecutable;
+import com.cyanogenmod.filemanager.console.ExecutionException;
+import com.cyanogenmod.filemanager.console.InsufficientPermissionsException;
+import com.cyanogenmod.filemanager.console.NoSuchFileOrDirectory;
+import com.cyanogenmod.filemanager.model.MountPoint;
+import com.cyanogenmod.filemanager.util.ParseHelper;
 
 import java.io.BufferedReader;
 import java.io.File;
diff --git a/src/com/cyanogenmod/explorer/commands/java/MoveCommand.java b/src/com/cyanogenmod/filemanager/commands/java/MoveCommand.java
index 1b5ab7d2..f19486db 100644
--- a/src/com/cyanogenmod/explorer/commands/java/MoveCommand.java
+++ b/src/com/cyanogenmod/filemanager/commands/java/MoveCommand.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.java;
+package com.cyanogenmod.filemanager.commands.java;
 
 import android.util.Log;
 
-import com.cyanogenmod.explorer.commands.MoveExecutable;
-import com.cyanogenmod.explorer.console.ExecutionException;
-import com.cyanogenmod.explorer.console.InsufficientPermissionsException;
-import com.cyanogenmod.explorer.console.NoSuchFileOrDirectory;
-import com.cyanogenmod.explorer.model.MountPoint;
-import com.cyanogenmod.explorer.util.MountPointHelper;
+import com.cyanogenmod.filemanager.commands.MoveExecutable;
+import com.cyanogenmod.filemanager.console.ExecutionException;
+import com.cyanogenmod.filemanager.console.InsufficientPermissionsException;
+import com.cyanogenmod.filemanager.console.NoSuchFileOrDirectory;
+import com.cyanogenmod.filemanager.model.MountPoint;
+import com.cyanogenmod.filemanager.util.MountPointHelper;
 
 import java.io.File;
 
diff --git a/src/com/cyanogenmod/explorer/commands/java/ParentDirCommand.java b/src/com/cyanogenmod/filemanager/commands/java/ParentDirCommand.java
index e08aa428..6b81e960 100644
--- a/src/com/cyanogenmod/explorer/commands/java/ParentDirCommand.java
+++ b/src/com/cyanogenmod/filemanager/commands/java/ParentDirCommand.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.java;
+package com.cyanogenmod.filemanager.commands.java;
 
 import android.util.Log;
 
-import com.cyanogenmod.explorer.commands.ParentDirExecutable;
-import com.cyanogenmod.explorer.console.ExecutionException;
-import com.cyanogenmod.explorer.console.InsufficientPermissionsException;
-import com.cyanogenmod.explorer.console.NoSuchFileOrDirectory;
+import com.cyanogenmod.filemanager.commands.ParentDirExecutable;
+import com.cyanogenmod.filemanager.console.ExecutionException;
+import com.cyanogenmod.filemanager.console.InsufficientPermissionsException;
+import com.cyanogenmod.filemanager.console.NoSuchFileOrDirectory;
 
 import java.io.File;
 
diff --git a/src/com/cyanogenmod/explorer/commands/java/Program.java b/src/com/cyanogenmod/filemanager/commands/java/Program.java
index ec8efa0f..b5eeebd2 100644
--- a/src/com/cyanogenmod/explorer/commands/java/Program.java
+++ b/src/com/cyanogenmod/filemanager/commands/java/Program.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.java;
+package com.cyanogenmod.filemanager.commands.java;
 
-import com.cyanogenmod.explorer.commands.Executable;
-import com.cyanogenmod.explorer.console.ExecutionException;
-import com.cyanogenmod.explorer.console.InsufficientPermissionsException;
-import com.cyanogenmod.explorer.console.NoSuchFileOrDirectory;
+import com.cyanogenmod.filemanager.commands.Executable;
+import com.cyanogenmod.filemanager.console.ExecutionException;
+import com.cyanogenmod.filemanager.console.InsufficientPermissionsException;
+import com.cyanogenmod.filemanager.console.NoSuchFileOrDirectory;
 
 
 /**
diff --git a/src/com/cyanogenmod/explorer/commands/java/ReadCommand.java b/src/com/cyanogenmod/filemanager/commands/java/ReadCommand.java
index 84fc3758..5aa4b96a 100644
--- a/src/com/cyanogenmod/explorer/commands/java/ReadCommand.java
+++ b/src/com/cyanogenmod/filemanager/commands/java/ReadCommand.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.java;
+package com.cyanogenmod.filemanager.commands.java;
 
 import android.util.Log;
 
-import com.cyanogenmod.explorer.commands.AsyncResultListener;
-import com.cyanogenmod.explorer.commands.ReadExecutable;
-import com.cyanogenmod.explorer.console.ExecutionException;
-import com.cyanogenmod.explorer.console.InsufficientPermissionsException;
-import com.cyanogenmod.explorer.console.NoSuchFileOrDirectory;
+import com.cyanogenmod.filemanager.commands.AsyncResultListener;
+import com.cyanogenmod.filemanager.commands.ReadExecutable;
+import com.cyanogenmod.filemanager.console.ExecutionException;
+import com.cyanogenmod.filemanager.console.InsufficientPermissionsException;
+import com.cyanogenmod.filemanager.console.NoSuchFileOrDirectory;
 
 import java.io.BufferedReader;
 import java.io.File;
diff --git a/src/com/cyanogenmod/explorer/commands/java/ResolveLinkCommand.java b/src/com/cyanogenmod/filemanager/commands/java/ResolveLinkCommand.java
index bf3722b4..fe94243e 100644
--- a/src/com/cyanogenmod/explorer/commands/java/ResolveLinkCommand.java
+++ b/src/com/cyanogenmod/filemanager/commands/java/ResolveLinkCommand.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.java;
+package com.cyanogenmod.filemanager.commands.java;
 
 import android.content.Context;
 import android.util.Log;
 
-import com.cyanogenmod.explorer.commands.ListExecutable.LIST_MODE;
-import com.cyanogenmod.explorer.commands.ResolveLinkExecutable;
-import com.cyanogenmod.explorer.console.ExecutionException;
-import com.cyanogenmod.explorer.console.InsufficientPermissionsException;
-import com.cyanogenmod.explorer.console.NoSuchFileOrDirectory;
-import com.cyanogenmod.explorer.model.FileSystemObject;
+import com.cyanogenmod.filemanager.commands.ListExecutable.LIST_MODE;
+import com.cyanogenmod.filemanager.commands.ResolveLinkExecutable;
+import com.cyanogenmod.filemanager.console.ExecutionException;
+import com.cyanogenmod.filemanager.console.InsufficientPermissionsException;
+import com.cyanogenmod.filemanager.console.NoSuchFileOrDirectory;
+import com.cyanogenmod.filemanager.model.FileSystemObject;
 
 import java.io.File;
 
diff --git a/src/com/cyanogenmod/explorer/commands/java/WriteCommand.java b/src/com/cyanogenmod/filemanager/commands/java/WriteCommand.java
index 4426c247..f743a42e 100644
--- a/src/com/cyanogenmod/explorer/commands/java/WriteCommand.java
+++ b/src/com/cyanogenmod/filemanager/commands/java/WriteCommand.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.java;
+package com.cyanogenmod.filemanager.commands.java;
 
 import android.util.Log;
 
-import com.cyanogenmod.explorer.commands.AsyncResultListener;
-import com.cyanogenmod.explorer.commands.WriteExecutable;
-import com.cyanogenmod.explorer.console.ExecutionException;
-import com.cyanogenmod.explorer.console.InsufficientPermissionsException;
-import com.cyanogenmod.explorer.console.NoSuchFileOrDirectory;
+import com.cyanogenmod.filemanager.commands.AsyncResultListener;
+import com.cyanogenmod.filemanager.commands.WriteExecutable;
+import com.cyanogenmod.filemanager.console.ExecutionException;
+import com.cyanogenmod.filemanager.console.InsufficientPermissionsException;
+import com.cyanogenmod.filemanager.console.NoSuchFileOrDirectory;
 
 import java.io.BufferedOutputStream;
 import java.io.File;
diff --git a/src/com/cyanogenmod/explorer/commands/shell/AsyncResultProgram.java b/src/com/cyanogenmod/filemanager/commands/shell/AsyncResultProgram.java
index 0b9e85a1..1b1f07d7 100644
--- a/src/com/cyanogenmod/explorer/commands/shell/AsyncResultProgram.java
+++ b/src/com/cyanogenmod/filemanager/commands/shell/AsyncResultProgram.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 
-import com.cyanogenmod.explorer.commands.AsyncResultExecutable;
-import com.cyanogenmod.explorer.commands.AsyncResultListener;
-import com.cyanogenmod.explorer.commands.SIGNAL;
-import com.cyanogenmod.explorer.util.FileHelper;
+import com.cyanogenmod.filemanager.commands.AsyncResultExecutable;
+import com.cyanogenmod.filemanager.commands.AsyncResultListener;
+import com.cyanogenmod.filemanager.commands.SIGNAL;
+import com.cyanogenmod.filemanager.util.FileHelper;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/com/cyanogenmod/explorer/commands/shell/AsyncResultProgramListener.java b/src/com/cyanogenmod/filemanager/commands/shell/AsyncResultProgramListener.java
index 28b1e106..158023c3 100644
--- a/src/com/cyanogenmod/explorer/commands/shell/AsyncResultProgramListener.java
+++ b/src/com/cyanogenmod/filemanager/commands/shell/AsyncResultProgramListener.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 
-import com.cyanogenmod.explorer.commands.SIGNAL;
+import com.cyanogenmod.filemanager.commands.SIGNAL;
 
 /**
  * An interface for communicate shell results in a asynchronous way.
diff --git a/src/com/cyanogenmod/explorer/commands/shell/BashShell.java b/src/com/cyanogenmod/filemanager/commands/shell/BashShell.java
index 75a4b42d..a357447a 100644
--- a/src/com/cyanogenmod/explorer/commands/shell/BashShell.java
+++ b/src/com/cyanogenmod/filemanager/commands/shell/BashShell.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 
 
 /**
diff --git a/src/com/cyanogenmod/explorer/commands/shell/ChangeCurrentDirCommand.java b/src/com/cyanogenmod/filemanager/commands/shell/ChangeCurrentDirCommand.java
index cb19871c..443e1f44 100644
--- a/src/com/cyanogenmod/explorer/commands/shell/ChangeCurrentDirCommand.java
+++ b/src/com/cyanogenmod/filemanager/commands/shell/ChangeCurrentDirCommand.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 
-import com.cyanogenmod.explorer.commands.ChangeCurrentDirExecutable;
-import com.cyanogenmod.explorer.console.CommandNotFoundException;
-import com.cyanogenmod.explorer.console.ExecutionException;
-import com.cyanogenmod.explorer.console.InsufficientPermissionsException;
+import com.cyanogenmod.filemanager.commands.ChangeCurrentDirExecutable;
+import com.cyanogenmod.filemanager.console.CommandNotFoundException;
+import com.cyanogenmod.filemanager.console.ExecutionException;
+import com.cyanogenmod.filemanager.console.InsufficientPermissionsException;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/src/com/cyanogenmod/explorer/commands/shell/ChangeOwnerCommand.java b/src/com/cyanogenmod/filemanager/commands/shell/ChangeOwnerCommand.java
index 34d7c6ca..6821a3a6 100644
--- a/src/com/cyanogenmod/explorer/commands/shell/ChangeOwnerCommand.java
+++ b/src/com/cyanogenmod/filemanager/commands/shell/ChangeOwnerCommand.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 
-import com.cyanogenmod.explorer.commands.ChangeOwnerExecutable;
-import com.cyanogenmod.explorer.console.CommandNotFoundException;
-import com.cyanogenmod.explorer.console.ExecutionException;
-import com.cyanogenmod.explorer.console.InsufficientPermissionsException;
-import com.cyanogenmod.explorer.model.Group;
-import com.cyanogenmod.explorer.model.MountPoint;
-import com.cyanogenmod.explorer.model.User;
-import com.cyanogenmod.explorer.util.MountPointHelper;
+import com.cyanogenmod.filemanager.commands.ChangeOwnerExecutable;
+import com.cyanogenmod.filemanager.console.CommandNotFoundException;
+import com.cyanogenmod.filemanager.console.ExecutionException;
+import com.cyanogenmod.filemanager.console.InsufficientPermissionsException;
+import com.cyanogenmod.filemanager.model.Group;
+import com.cyanogenmod.filemanager.model.MountPoint;
+import com.cyanogenmod.filemanager.model.User;
+import com.cyanogenmod.filemanager.util.MountPointHelper;
 
 import java.text.ParseException;
 
diff --git a/src/com/cyanogenmod/explorer/commands/shell/ChangePermissionsCommand.java b/src/com/cyanogenmod/filemanager/commands/shell/ChangePermissionsCommand.java
index 59a94dbf..3fc2e08d 100644
--- a/src/com/cyanogenmod/explorer/commands/shell/ChangePermissionsCommand.java
+++ b/src/com/cyanogenmod/filemanager/commands/shell/ChangePermissionsCommand.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 
-import com.cyanogenmod.explorer.commands.ChangePermissionsExecutable;
-import com.cyanogenmod.explorer.console.CommandNotFoundException;
-import com.cyanogenmod.explorer.console.ExecutionException;
-import com.cyanogenmod.explorer.console.InsufficientPermissionsException;
-import com.cyanogenmod.explorer.model.MountPoint;
-import com.cyanogenmod.explorer.model.Permissions;
-import com.cyanogenmod.explorer.util.MountPointHelper;
+import com.cyanogenmod.filemanager.commands.ChangePermissionsExecutable;
+import com.cyanogenmod.filemanager.console.CommandNotFoundException;
+import com.cyanogenmod.filemanager.console.ExecutionException;
+import com.cyanogenmod.filemanager.console.InsufficientPermissionsException;
+import com.cyanogenmod.filemanager.model.MountPoint;
+import com.cyanogenmod.filemanager.model.Permissions;
+import com.cyanogenmod.filemanager.util.MountPointHelper;
 
 import java.text.ParseException;
 
diff --git a/src/com/cyanogenmod/explorer/commands/shell/Command.java b/src/com/cyanogenmod/filemanager/commands/shell/Command.java
index 4332ae6e..cf9a9f5c 100644
--- a/src/com/cyanogenmod/explorer/commands/shell/Command.java
+++ b/src/com/cyanogenmod/filemanager/commands/shell/Command.java
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 
 import android.content.res.Resources;
 import android.content.res.XmlResourceParser;
 
 import com.android.internal.util.XmlUtils;
-import com.cyanogenmod.explorer.ExplorerApplication;
-import com.cyanogenmod.explorer.R;
-import com.cyanogenmod.explorer.console.CommandNotFoundException;
-import com.cyanogenmod.explorer.console.ExecutionException;
-import com.cyanogenmod.explorer.console.InsufficientPermissionsException;
-import com.cyanogenmod.explorer.preferences.ExplorerSettings;
-import com.cyanogenmod.explorer.preferences.Preferences;
-import com.cyanogenmod.explorer.util.ShellHelper;
+import com.cyanogenmod.filemanager.FileManagerApplication;
+import com.cyanogenmod.filemanager.R;
+import com.cyanogenmod.filemanager.console.CommandNotFoundException;
+import com.cyanogenmod.filemanager.console.ExecutionException;
+import com.cyanogenmod.filemanager.console.InsufficientPermissionsException;
+import com.cyanogenmod.filemanager.preferences.FileManagerSettings;
+import com.cyanogenmod.filemanager.preferences.Preferences;
+import com.cyanogenmod.filemanager.util.ShellHelper;
 
 import org.xmlpull.v1.XmlPullParserException;
 
@@ -100,7 +100,7 @@ public abstract class Command {
         }
 
         //Load the command info
-        getCommandInfo(ExplorerApplication.getInstance().getResources());
+        getCommandInfo(FileManagerApplication.getInstance().getResources());
 
         // Get the current trace value
         reloadTrace();
@@ -154,8 +154,8 @@ public abstract class Command {
      */
     public final void reloadTrace() {
         this.mTrace = Preferences.getSharedPreferences().getBoolean(
-                ExplorerSettings.SETTINGS_SHOW_TRACES.getId(),
-                ((Boolean)ExplorerSettings.SETTINGS_SHOW_TRACES.getDefaultValue()).booleanValue());
+                FileManagerSettings.SETTINGS_SHOW_TRACES.getId(),
+                ((Boolean)FileManagerSettings.SETTINGS_SHOW_TRACES.getDefaultValue()).booleanValue());
     }
 
     /**
diff --git a/src/com/cyanogenmod/explorer/commands/shell/CompressCommand.java b/src/com/cyanogenmod/filemanager/commands/shell/CompressCommand.java
index 1195d74b..d4dec8d8 100644
--- a/src/com/cyanogenmod/explorer/commands/shell/CompressCommand.java
+++ b/src/com/cyanogenmod/filemanager/commands/shell/CompressCommand.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
-
-import com.cyanogenmod.explorer.commands.AsyncResultListener;
-import com.cyanogenmod.explorer.commands.CompressExecutable;
-import com.cyanogenmod.explorer.commands.SIGNAL;
-import com.cyanogenmod.explorer.console.CommandNotFoundException;
-import com.cyanogenmod.explorer.console.ExecutionException;
-import com.cyanogenmod.explorer.console.InsufficientPermissionsException;
-import com.cyanogenmod.explorer.preferences.CompressionMode;
-import com.cyanogenmod.explorer.util.FileHelper;
+package com.cyanogenmod.filemanager.commands.shell;
+
+import com.cyanogenmod.filemanager.commands.AsyncResultListener;
+import com.cyanogenmod.filemanager.commands.CompressExecutable;
+import com.cyanogenmod.filemanager.commands.SIGNAL;
+import com.cyanogenmod.filemanager.console.CommandNotFoundException;
+import com.cyanogenmod.filemanager.console.ExecutionException;
+import com.cyanogenmod.filemanager.console.InsufficientPermissionsException;
+import com.cyanogenmod.filemanager.preferences.CompressionMode;
+import com.cyanogenmod.filemanager.util.FileHelper;
 
 import java.io.File;
 
diff --git a/src/com/cyanogenmod/explorer/commands/shell/CopyCommand.java b/src/com/cyanogenmod/filemanager/commands/shell/CopyCommand.java
index 8cc30ed8..a1e50b34 100644
--- a/src/com/cyanogenmod/explorer/commands/shell/CopyCommand.java
+++ b/src/com/cyanogenmod/filemanager/commands/shell/CopyCommand.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 
-import com.cyanogenmod.explorer.commands.CopyExecutable;
-import com.cyanogenmod.explorer.console.CommandNotFoundException;
-import com.cyanogenmod.explorer.console.ExecutionException;
-import com.cyanogenmod.explorer.console.InsufficientPermissionsException;
-import com.cyanogenmod.explorer.model.MountPoint;
-import com.cyanogenmod.explorer.util.MountPointHelper;
+import com.cyanogenmod.filemanager.commands.CopyExecutable;
+import com.cyanogenmod.filemanager.console.CommandNotFoundException;
+import com.cyanogenmod.filemanager.console.ExecutionException;
+import com.cyanogenmod.filemanager.console.InsufficientPermissionsException;
+import com.cyanogenmod.filemanager.model.MountPoint;
+import com.cyanogenmod.filemanager.util.MountPointHelper;
 
 import java.text.ParseException;
 
diff --git a/src/com/cyanogenmod/explorer/commands/shell/CreateDirCommand.java b/src/com/cyanogenmod/filemanager/commands/shell/CreateDirCommand.java
index ecbf33c3..d80184bb 100644
--- a/src/com/cyanogenmod/explorer/commands/shell/CreateDirCommand.java
+++ b/src/com/cyanogenmod/filemanager/commands/shell/CreateDirCommand.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 
-import com.cyanogenmod.explorer.commands.CreateDirExecutable;
-import com.cyanogenmod.explorer.console.CommandNotFoundException;
-import com.cyanogenmod.explorer.console.ExecutionException;
-import com.cyanogenmod.explorer.console.InsufficientPermissionsException;
-import com.cyanogenmod.explorer.model.MountPoint;
-import com.cyanogenmod.explorer.util.MountPointHelper;
+import com.cyanogenmod.filemanager.commands.CreateDirExecutable;
+import com.cyanogenmod.filemanager.console.CommandNotFoundException;
+import com.cyanogenmod.filemanager.console.ExecutionException;
+import com.cyanogenmod.filemanager.console.InsufficientPermissionsException;
+import com.cyanogenmod.filemanager.model.MountPoint;
+import com.cyanogenmod.filemanager.util.MountPointHelper;
 
 import java.text.ParseException;
 
diff --git a/src/com/cyanogenmod/explorer/commands/shell/CreateFileCommand.java b/src/com/cyanogenmod/filemanager/commands/shell/CreateFileCommand.java
index d440e930..e60085d3 100644
--- a/src/com/cyanogenmod/explorer/commands/shell/CreateFileCommand.java
+++ b/src/com/cyanogenmod/filemanager/commands/shell/CreateFileCommand.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 
-import com.cyanogenmod.explorer.commands.CreateFileExecutable;
-import com.cyanogenmod.explorer.console.CommandNotFoundException;
-import com.cyanogenmod.explorer.console.ExecutionException;
-import com.cyanogenmod.explorer.console.InsufficientPermissionsException;
-import com.cyanogenmod.explorer.model.MountPoint;
-import com.cyanogenmod.explorer.util.MountPointHelper;
+import com.cyanogenmod.filemanager.commands.CreateFileExecutable;
+import com.cyanogenmod.filemanager.console.CommandNotFoundException;
+import com.cyanogenmod.filemanager.console.ExecutionException;
+import com.cyanogenmod.filemanager.console.InsufficientPermissionsException;
+import com.cyanogenmod.filemanager.model.MountPoint;
+import com.cyanogenmod.filemanager.util.MountPointHelper;
 
 import java.text.ParseException;
 
diff --git a/src/com/cyanogenmod/explorer/commands/shell/CurrentDirCommand.java b/src/com/cyanogenmod/filemanager/commands/shell/CurrentDirCommand.java
index e25baf03..9c106a68 100644
--- a/src/com/cyanogenmod/explorer/commands/shell/CurrentDirCommand.java
+++ b/src/com/cyanogenmod/filemanager/commands/shell/CurrentDirCommand.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 
-import com.cyanogenmod.explorer.commands.CurrentDirExecutable;
-import com.cyanogenmod.explorer.console.CommandNotFoundException;
-import com.cyanogenmod.explorer.console.ExecutionException;
-import com.cyanogenmod.explorer.console.InsufficientPermissionsException;
+import com.cyanogenmod.filemanager.commands.CurrentDirExecutable;
+import com.cyanogenmod.filemanager.console.CommandNotFoundException;
+import com.cyanogenmod.filemanager.console.ExecutionException;
+import com.cyanogenmod.filemanager.console.InsufficientPermissionsException;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/src/com/cyanogenmod/explorer/commands/shell/DeleteDirCommand.java b/src/com/cyanogenmod/filemanager/commands/shell/DeleteDirCommand.java
index b7d2e443..533f47d6 100644
--- a/src/com/cyanogenmod/explorer/commands/shell/DeleteDirCommand.java
+++ b/src/com/cyanogenmod/filemanager/commands/shell/DeleteDirCommand.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 
-import com.cyanogenmod.explorer.commands.DeleteDirExecutable;
-import com.cyanogenmod.explorer.console.CommandNotFoundException;
-import com.cyanogenmod.explorer.console.ExecutionException;
-import com.cyanogenmod.explorer.console.InsufficientPermissionsException;
-import com.cyanogenmod.explorer.model.MountPoint;
-import com.cyanogenmod.explorer.util.MountPointHelper;
+import com.cyanogenmod.filemanager.commands.DeleteDirExecutable;
+import com.cyanogenmod.filemanager.console.CommandNotFoundException;
+import com.cyanogenmod.filemanager.console.ExecutionException;
+import com.cyanogenmod.filemanager.console.InsufficientPermissionsException;
+import com.cyanogenmod.filemanager.model.MountPoint;
+import com.cyanogenmod.filemanager.util.MountPointHelper;
 
 import java.text.ParseException;
 
diff --git a/src/com/cyanogenmod/explorer/commands/shell/DeleteFileCommand.java b/src/com/cyanogenmod/filemanager/commands/shell/DeleteFileCommand.java
index 40ed8f0a..59d3f84a 100644
--- a/src/com/cyanogenmod/explorer/commands/shell/DeleteFileCommand.java
+++ b/src/com/cyanogenmod/filemanager/commands/shell/DeleteFileCommand.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 
-import com.cyanogenmod.explorer.commands.DeleteFileExecutable;
-import com.cyanogenmod.explorer.console.CommandNotFoundException;
-import com.cyanogenmod.explorer.console.ExecutionException;
-import com.cyanogenmod.explorer.console.InsufficientPermissionsException;
-import com.cyanogenmod.explorer.model.MountPoint;
-import com.cyanogenmod.explorer.util.MountPointHelper;
+import com.cyanogenmod.filemanager.commands.DeleteFileExecutable;
+import com.cyanogenmod.filemanager.console.CommandNotFoundException;
+import com.cyanogenmod.filemanager.console.ExecutionException;
+import com.cyanogenmod.filemanager.console.InsufficientPermissionsException;
+import com.cyanogenmod.filemanager.model.MountPoint;
+import com.cyanogenmod.filemanager.util.MountPointHelper;
 
 import java.text.ParseException;
 
diff --git a/src/com/cyanogenmod/explorer/commands/shell/DiskUsageCommand.java b/src/com/cyanogenmod/filemanager/commands/shell/DiskUsageCommand.java
index 2844f567..35c86a1e 100644
--- a/src/com/cyanogenmod/explorer/commands/shell/DiskUsageCommand.java
+++ b/src/com/cyanogenmod/filemanager/commands/shell/DiskUsageCommand.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
-
-import com.cyanogenmod.explorer.commands.DiskUsageExecutable;
-import com.cyanogenmod.explorer.console.CommandNotFoundException;
-import com.cyanogenmod.explorer.console.ExecutionException;
-import com.cyanogenmod.explorer.console.InsufficientPermissionsException;
-import com.cyanogenmod.explorer.model.DiskUsage;
-import com.cyanogenmod.explorer.util.ParseHelper;
+package com.cyanogenmod.filemanager.commands.shell;
+
+import com.cyanogenmod.filemanager.commands.DiskUsageExecutable;
+import com.cyanogenmod.filemanager.console.CommandNotFoundException;
+import com.cyanogenmod.filemanager.console.ExecutionException;
+import com.cyanogenmod.filemanager.console.InsufficientPermissionsException;
+import com.cyanogenmod.filemanager.model.DiskUsage;
+import com.cyanogenmod.filemanager.util.ParseHelper;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/src/com/cyanogenmod/explorer/commands/shell/EchoCommand.java b/src/com/cyanogenmod/filemanager/commands/shell/EchoCommand.java
index a5b6b92b..8488343f 100644
--- a/src/com/cyanogenmod/explorer/commands/shell/EchoCommand.java
+++ b/src/com/cyanogenmod/filemanager/commands/shell/EchoCommand.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 
-import com.cyanogenmod.explorer.commands.EchoExecutable;
-import com.cyanogenmod.explorer.console.CommandNotFoundException;
-import com.cyanogenmod.explorer.console.ExecutionException;
-import com.cyanogenmod.explorer.console.InsufficientPermissionsException;
+import com.cyanogenmod.filemanager.commands.EchoExecutable;
+import com.cyanogenmod.filemanager.console.CommandNotFoundException;
+import com.cyanogenmod.filemanager.console.ExecutionException;
+import com.cyanogenmod.filemanager.console.InsufficientPermissionsException;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/src/com/cyanogenmod/explorer/commands/shell/ExecCommand.java b/src/com/cyanogenmod/filemanager/commands/shell/ExecCommand.java
index 76fe7d4c..c66cef9f 100644
--- a/src/com/cyanogenmod/explorer/commands/shell/ExecCommand.java
+++ b/src/com/cyanogenmod/filemanager/commands/shell/ExecCommand.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 
-import com.cyanogenmod.explorer.commands.AsyncResultListener;
-import com.cyanogenmod.explorer.commands.ExecExecutable;
-import com.cyanogenmod.explorer.commands.SIGNAL;
-import com.cyanogenmod.explorer.console.CommandNotFoundException;
-import com.cyanogenmod.explorer.console.ExecutionException;
-import com.cyanogenmod.explorer.console.InsufficientPermissionsException;
+import com.cyanogenmod.filemanager.commands.AsyncResultListener;
+import com.cyanogenmod.filemanager.commands.ExecExecutable;
+import com.cyanogenmod.filemanager.commands.SIGNAL;
+import com.cyanogenmod.filemanager.console.CommandNotFoundException;
+import com.cyanogenmod.filemanager.console.ExecutionException;
+import com.cyanogenmod.filemanager.console.InsufficientPermissionsException;
 
 /**
  * A class for execute a command
diff --git a/src/com/cyanogenmod/explorer/commands/shell/FindCommand.java b/src/com/cyanogenmod/filemanager/commands/shell/FindCommand.java
index 6cd71af5..033d5e02 100644
--- a/src/com/cyanogenmod/explorer/commands/shell/FindCommand.java
+++ b/src/com/cyanogenmod/filemanager/commands/shell/FindCommand.java
@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 
 import android.util.Log;
 
-import com.cyanogenmod.explorer.commands.AsyncResultListener;
-import com.cyanogenmod.explorer.commands.FindExecutable;
-import com.cyanogenmod.explorer.commands.SIGNAL;
-import com.cyanogenmod.explorer.console.CommandNotFoundException;
-import com.cyanogenmod.explorer.console.ExecutionException;
-import com.cyanogenmod.explorer.console.InsufficientPermissionsException;
-import com.cyanogenmod.explorer.model.FileSystemObject;
-import com.cyanogenmod.explorer.model.Query;
-import com.cyanogenmod.explorer.util.FileHelper;
-import com.cyanogenmod.explorer.util.ParseHelper;
-import com.cyanogenmod.explorer.util.SearchHelper;
+import com.cyanogenmod.filemanager.commands.AsyncResultListener;
+import com.cyanogenmod.filemanager.commands.FindExecutable;
+import com.cyanogenmod.filemanager.commands.SIGNAL;
+import com.cyanogenmod.filemanager.console.CommandNotFoundException;
+import com.cyanogenmod.filemanager.console.ExecutionException;
+import com.cyanogenmod.filemanager.console.InsufficientPermissionsException;
+import com.cyanogenmod.filemanager.model.FileSystemObject;
+import com.cyanogenmod.filemanager.model.Query;
+import com.cyanogenmod.filemanager.util.FileHelper;
+import com.cyanogenmod.filemanager.util.ParseHelper;
+import com.cyanogenmod.filemanager.util.SearchHelper;
 
 import java.io.BufferedReader;
 import java.io.File;
diff --git a/src/com/cyanogenmod/explorer/commands/shell/FolderUsageCommand.java b/src/com/cyanogenmod/filemanager/commands/shell/FolderUsageCommand.java
index a5d9b074..807e883c 100644
--- a/src/com/cyanogenmod/explorer/commands/shell/FolderUsageCommand.java
+++ b/src/com/cyanogenmod/filemanager/commands/shell/FolderUsageCommand.java
@@ -14,24 +14,24 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 
 import android.util.Log;
 
-import com.cyanogenmod.explorer.commands.AsyncResultListener;
-import com.cyanogenmod.explorer.commands.FolderUsageExecutable;
-import com.cyanogenmod.explorer.commands.SIGNAL;
-import com.cyanogenmod.explorer.console.CommandNotFoundException;
-import com.cyanogenmod.explorer.console.ExecutionException;
-import com.cyanogenmod.explorer.console.InsufficientPermissionsException;
-import com.cyanogenmod.explorer.model.Directory;
-import com.cyanogenmod.explorer.model.FileSystemObject;
-import com.cyanogenmod.explorer.model.FolderUsage;
-import com.cyanogenmod.explorer.model.Symlink;
-import com.cyanogenmod.explorer.util.FileHelper;
-import com.cyanogenmod.explorer.util.MimeTypeHelper;
-import com.cyanogenmod.explorer.util.MimeTypeHelper.MimeTypeCategory;
-import com.cyanogenmod.explorer.util.ParseHelper;
+import com.cyanogenmod.filemanager.commands.AsyncResultListener;
+import com.cyanogenmod.filemanager.commands.FolderUsageExecutable;
+import com.cyanogenmod.filemanager.commands.SIGNAL;
+import com.cyanogenmod.filemanager.console.CommandNotFoundException;
+import com.cyanogenmod.filemanager.console.ExecutionException;
+import com.cyanogenmod.filemanager.console.InsufficientPermissionsException;
+import com.cyanogenmod.filemanager.model.Directory;
+import com.cyanogenmod.filemanager.model.FileSystemObject;
+import com.cyanogenmod.filemanager.model.FolderUsage;
+import com.cyanogenmod.filemanager.model.Symlink;
+import com.cyanogenmod.filemanager.util.FileHelper;
+import com.cyanogenmod.filemanager.util.MimeTypeHelper;
+import com.cyanogenmod.filemanager.util.MimeTypeHelper.MimeTypeCategory;
+import com.cyanogenmod.filemanager.util.ParseHelper;
 
 import java.io.BufferedReader;
 import java.io.StringReader;
diff --git a/src/com/cyanogenmod/explorer/commands/shell/GroupsCommand.java b/src/com/cyanogenmod/filemanager/commands/shell/GroupsCommand.java
index ce97a436..e6eb99d0 100644
--- a/src/com/cyanogenmod/explorer/commands/shell/GroupsCommand.java
+++ b/src/com/cyanogenmod/filemanager/commands/shell/GroupsCommand.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 
-import com.cyanogenmod.explorer.commands.GroupsExecutable;
-import com.cyanogenmod.explorer.console.CommandNotFoundException;
-import com.cyanogenmod.explorer.console.ExecutionException;
-import com.cyanogenmod.explorer.console.InsufficientPermissionsException;
-import com.cyanogenmod.explorer.model.Group;
-import com.cyanogenmod.explorer.util.FileHelper;
+import com.cyanogenmod.filemanager.commands.GroupsExecutable;
+import com.cyanogenmod.filemanager.console.CommandNotFoundException;
+import com.cyanogenmod.filemanager.console.ExecutionException;
+import com.cyanogenmod.filemanager.console.InsufficientPermissionsException;
+import com.cyanogenmod.filemanager.model.Group;
+import com.cyanogenmod.filemanager.util.FileHelper;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/src/com/cyanogenmod/explorer/commands/shell/IdentityCommand.java b/src/com/cyanogenmod/filemanager/commands/shell/IdentityCommand.java
index 0d741f4b..339637a6 100644
--- a/src/com/cyanogenmod/explorer/commands/shell/IdentityCommand.java
+++ b/src/com/cyanogenmod/filemanager/commands/shell/IdentityCommand.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
-
-import com.cyanogenmod.explorer.commands.IdentityExecutable;
-import com.cyanogenmod.explorer.console.CommandNotFoundException;
-import com.cyanogenmod.explorer.console.ExecutionException;
-import com.cyanogenmod.explorer.console.InsufficientPermissionsException;
-import com.cyanogenmod.explorer.model.AID;
-import com.cyanogenmod.explorer.model.Group;
-import com.cyanogenmod.explorer.model.Identity;
-import com.cyanogenmod.explorer.model.User;
-import com.cyanogenmod.explorer.util.FileHelper;
+package com.cyanogenmod.filemanager.commands.shell;
+
+import com.cyanogenmod.filemanager.commands.IdentityExecutable;
+import com.cyanogenmod.filemanager.console.CommandNotFoundException;
+import com.cyanogenmod.filemanager.console.ExecutionException;
+import com.cyanogenmod.filemanager.console.InsufficientPermissionsException;
+import com.cyanogenmod.filemanager.model.AID;
+import com.cyanogenmod.filemanager.model.Group;
+import com.cyanogenmod.filemanager.model.Identity;
+import com.cyanogenmod.filemanager.model.User;
+import com.cyanogenmod.filemanager.util.FileHelper;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/src/com/cyanogenmod/explorer/commands/shell/InvalidCommandDefinitionException.java b/src/com/cyanogenmod/filemanager/commands/shell/InvalidCommandDefinitionException.java
index f825eb72..93ea2498 100644
--- a/src/com/cyanogenmod/explorer/commands/shell/InvalidCommandDefinitionException.java
+++ b/src/com/cyanogenmod/filemanager/commands/shell/InvalidCommandDefinitionException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 
 /**
  * An exception thrown when the information of the command is
diff --git a/src/com/cyanogenmod/explorer/commands/shell/LinkCommand.java b/src/com/cyanogenmod/filemanager/commands/shell/LinkCommand.java
index cfd1742a..31ae067d 100644
--- a/src/com/cyanogenmod/explorer/commands/shell/LinkCommand.java
+++ b/src/com/cyanogenmod/filemanager/commands/shell/LinkCommand.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 
-import com.cyanogenmod.explorer.commands.LinkExecutable;
-import com.cyanogenmod.explorer.console.CommandNotFoundException;
-import com.cyanogenmod.explorer.console.ExecutionException;
-import com.cyanogenmod.explorer.console.InsufficientPermissionsException;
-import com.cyanogenmod.explorer.model.MountPoint;
-import com.cyanogenmod.explorer.util.MountPointHelper;
+import com.cyanogenmod.filemanager.commands.LinkExecutable;
+import com.cyanogenmod.filemanager.console.CommandNotFoundException;
+import com.cyanogenmod.filemanager.console.ExecutionException;
+import com.cyanogenmod.filemanager.console.InsufficientPermissionsException;
+import com.cyanogenmod.filemanager.model.MountPoint;
+import com.cyanogenmod.filemanager.util.MountPointHelper;
 
 import java.text.ParseException;
 
diff --git a/src/com/cyanogenmod/explorer/commands/shell/ListCommand.java b/src/com/cyanogenmod/filemanager/commands/shell/ListCommand.java
index d7a4a23c..abc07418 100644
--- a/src/com/cyanogenmod/explorer/commands/shell/ListCommand.java
+++ b/src/com/cyanogenmod/filemanager/commands/shell/ListCommand.java
@@ -14,23 +14,23 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
-
-import com.cyanogenmod.explorer.ExplorerApplication;
-import com.cyanogenmod.explorer.commands.ListExecutable;
-import com.cyanogenmod.explorer.console.CommandNotFoundException;
-import com.cyanogenmod.explorer.console.ConsoleAllocException;
-import com.cyanogenmod.explorer.console.ExecutionException;
-import com.cyanogenmod.explorer.console.InsufficientPermissionsException;
-import com.cyanogenmod.explorer.console.NoSuchFileOrDirectory;
-import com.cyanogenmod.explorer.console.OperationTimeoutException;
-import com.cyanogenmod.explorer.console.shell.ShellConsole;
-import com.cyanogenmod.explorer.model.FileSystemObject;
-import com.cyanogenmod.explorer.model.ParentDirectory;
-import com.cyanogenmod.explorer.model.Symlink;
-import com.cyanogenmod.explorer.util.CommandHelper;
-import com.cyanogenmod.explorer.util.FileHelper;
-import com.cyanogenmod.explorer.util.ParseHelper;
+package com.cyanogenmod.filemanager.commands.shell;
+
+import com.cyanogenmod.filemanager.FileManagerApplication;
+import com.cyanogenmod.filemanager.commands.ListExecutable;
+import com.cyanogenmod.filemanager.console.CommandNotFoundException;
+import com.cyanogenmod.filemanager.console.ConsoleAllocException;
+import com.cyanogenmod.filemanager.console.ExecutionException;
+import com.cyanogenmod.filemanager.console.InsufficientPermissionsException;
+import com.cyanogenmod.filemanager.console.NoSuchFileOrDirectory;
+import com.cyanogenmod.filemanager.console.OperationTimeoutException;
+import com.cyanogenmod.filemanager.console.shell.ShellConsole;
+import com.cyanogenmod.filemanager.model.FileSystemObject;
+import com.cyanogenmod.filemanager.model.ParentDirectory;
+import com.cyanogenmod.filemanager.model.Symlink;
+import com.cyanogenmod.filemanager.util.CommandHelper;
+import com.cyanogenmod.filemanager.util.FileHelper;
+import com.cyanogenmod.filemanager.util.ParseHelper;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -96,7 +96,7 @@ public class ListCommand extends SyncResultProgram implements ListExecutable {
         } else {
             this.mParentDir =
                 CommandHelper.getAbsolutePath(
-                        ExplorerApplication.
+                        FileManagerApplication.
                             getInstance().getApplicationContext(), src, console);
         }
     }
@@ -153,12 +153,12 @@ public class ListCommand extends SyncResultProgram implements ListExecutable {
             // Try to resolve from a console
             String abspath =
                 CommandHelper.getAbsolutePath(
-                        ExplorerApplication.getInstance().
+                        FileManagerApplication.getInstance().
                             getApplicationContext(), src, console);
             //Resolve the parent directory
             this.mParentDir =
                 CommandHelper.getParentDir(
-                        ExplorerApplication.getInstance().getApplicationContext(),
+                        FileManagerApplication.getInstance().getApplicationContext(),
                         abspath, console);
         }
     }
diff --git a/src/com/cyanogenmod/explorer/commands/shell/MountCommand.java b/src/com/cyanogenmod/filemanager/commands/shell/MountCommand.java
index a2e41a55..eae5e831 100644
--- a/src/com/cyanogenmod/explorer/commands/shell/MountCommand.java
+++ b/src/com/cyanogenmod/filemanager/commands/shell/MountCommand.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 
-import com.cyanogenmod.explorer.commands.MountExecutable;
-import com.cyanogenmod.explorer.console.CommandNotFoundException;
-import com.cyanogenmod.explorer.console.ExecutionException;
-import com.cyanogenmod.explorer.console.InsufficientPermissionsException;
-import com.cyanogenmod.explorer.model.MountPoint;
+import com.cyanogenmod.filemanager.commands.MountExecutable;
+import com.cyanogenmod.filemanager.console.CommandNotFoundException;
+import com.cyanogenmod.filemanager.console.ExecutionException;
+import com.cyanogenmod.filemanager.console.InsufficientPermissionsException;
+import com.cyanogenmod.filemanager.model.MountPoint;
 
 import java.text.ParseException;
 
diff --git a/src/com/cyanogenmod/explorer/commands/shell/MountPointInfoCommand.java b/src/com/cyanogenmod/filemanager/commands/shell/MountPointInfoCommand.java
index 0be19e70..f153cea6 100644
--- a/src/com/cyanogenmod/explorer/commands/shell/MountPointInfoCommand.java
+++ b/src/com/cyanogenmod/filemanager/commands/shell/MountPointInfoCommand.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
-
-import com.cyanogenmod.explorer.commands.MountPointInfoExecutable;
-import com.cyanogenmod.explorer.console.CommandNotFoundException;
-import com.cyanogenmod.explorer.console.ExecutionException;
-import com.cyanogenmod.explorer.console.InsufficientPermissionsException;
-import com.cyanogenmod.explorer.model.MountPoint;
-import com.cyanogenmod.explorer.util.ParseHelper;
+package com.cyanogenmod.filemanager.commands.shell;
+
+import com.cyanogenmod.filemanager.commands.MountPointInfoExecutable;
+import com.cyanogenmod.filemanager.console.CommandNotFoundException;
+import com.cyanogenmod.filemanager.console.ExecutionException;
+import com.cyanogenmod.filemanager.console.InsufficientPermissionsException;
+import com.cyanogenmod.filemanager.model.MountPoint;
+import com.cyanogenmod.filemanager.util.ParseHelper;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/src/com/cyanogenmod/explorer/commands/shell/MoveCommand.java b/src/com/cyanogenmod/filemanager/commands/shell/MoveCommand.java
index 6abeae25..1915f2d2 100644
--- a/src/com/cyanogenmod/explorer/commands/shell/MoveCommand.java
+++ b/src/com/cyanogenmod/filemanager/commands/shell/MoveCommand.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 
-import com.cyanogenmod.explorer.commands.MoveExecutable;
-import com.cyanogenmod.explorer.console.CommandNotFoundException;
-import com.cyanogenmod.explorer.console.ExecutionException;
-import com.cyanogenmod.explorer.console.InsufficientPermissionsException;
-import com.cyanogenmod.explorer.model.MountPoint;
-import com.cyanogenmod.explorer.util.MountPointHelper;
+import com.cyanogenmod.filemanager.commands.MoveExecutable;
+import com.cyanogenmod.filemanager.console.CommandNotFoundException;
+import com.cyanogenmod.filemanager.console.ExecutionException;
+import com.cyanogenmod.filemanager.console.InsufficientPermissionsException;
+import com.cyanogenmod.filemanager.model.MountPoint;
+import com.cyanogenmod.filemanager.util.MountPointHelper;
 
 import java.text.ParseException;
 
diff --git a/src/com/cyanogenmod/explorer/commands/shell/ParentDirCommand.java b/src/com/cyanogenmod/filemanager/commands/shell/ParentDirCommand.java
index e14ad4e6..3da542f4 100644
--- a/src/com/cyanogenmod/explorer/commands/shell/ParentDirCommand.java
+++ b/src/com/cyanogenmod/filemanager/commands/shell/ParentDirCommand.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 
-import com.cyanogenmod.explorer.commands.ParentDirExecutable;
-import com.cyanogenmod.explorer.console.CommandNotFoundException;
-import com.cyanogenmod.explorer.console.ExecutionException;
-import com.cyanogenmod.explorer.console.InsufficientPermissionsException;
+import com.cyanogenmod.filemanager.commands.ParentDirExecutable;
+import com.cyanogenmod.filemanager.console.CommandNotFoundException;
+import com.cyanogenmod.filemanager.console.ExecutionException;
+import com.cyanogenmod.filemanager.console.InsufficientPermissionsException;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/src/com/cyanogenmod/explorer/commands/shell/ProcessIdCommand.java b/src/com/cyanogenmod/filemanager/commands/shell/ProcessIdCommand.java
index fc202033..fd99b92c 100644
--- a/src/com/cyanogenmod/explorer/commands/shell/ProcessIdCommand.java
+++ b/src/com/cyanogenmod/filemanager/commands/shell/ProcessIdCommand.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 
-import com.cyanogenmod.explorer.commands.ProcessIdExecutable;
-import com.cyanogenmod.explorer.console.CommandNotFoundException;
-import com.cyanogenmod.explorer.console.ExecutionException;
-import com.cyanogenmod.explorer.console.InsufficientPermissionsException;
+import com.cyanogenmod.filemanager.commands.ProcessIdExecutable;
+import com.cyanogenmod.filemanager.console.CommandNotFoundException;
+import com.cyanogenmod.filemanager.console.ExecutionException;
+import com.cyanogenmod.filemanager.console.InsufficientPermissionsException;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/src/com/cyanogenmod/explorer/commands/shell/Program.java b/src/com/cyanogenmod/filemanager/commands/shell/Program.java
index fbba9695..ae811c02 100644
--- a/src/com/cyanogenmod/explorer/commands/shell/Program.java
+++ b/src/com/cyanogenmod/filemanager/commands/shell/Program.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 
-import com.cyanogenmod.explorer.commands.Executable;
-import com.cyanogenmod.explorer.console.CommandNotFoundException;
-import com.cyanogenmod.explorer.console.ExecutionException;
-import com.cyanogenmod.explorer.console.InsufficientPermissionsException;
-import com.cyanogenmod.explorer.console.NoSuchFileOrDirectory;
+import com.cyanogenmod.filemanager.commands.Executable;
+import com.cyanogenmod.filemanager.console.CommandNotFoundException;
+import com.cyanogenmod.filemanager.console.ExecutionException;
+import com.cyanogenmod.filemanager.console.InsufficientPermissionsException;
+import com.cyanogenmod.filemanager.console.NoSuchFileOrDirectory;
 
 import java.io.OutputStream;
 
diff --git a/src/com/cyanogenmod/explorer/commands/shell/QuickFolderSearchCommand.java b/src/com/cyanogenmod/filemanager/commands/shell/QuickFolderSearchCommand.java
index 544a6baa..b060381b 100644
--- a/src/com/cyanogenmod/explorer/commands/shell/QuickFolderSearchCommand.java
+++ b/src/com/cyanogenmod/filemanager/commands/shell/QuickFolderSearchCommand.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 
-import com.cyanogenmod.explorer.commands.QuickFolderSearchExecutable;
-import com.cyanogenmod.explorer.console.CommandNotFoundException;
-import com.cyanogenmod.explorer.console.ExecutionException;
-import com.cyanogenmod.explorer.console.InsufficientPermissionsException;
+import com.cyanogenmod.filemanager.commands.QuickFolderSearchExecutable;
+import com.cyanogenmod.filemanager.console.CommandNotFoundException;
+import com.cyanogenmod.filemanager.console.ExecutionException;
+import com.cyanogenmod.filemanager.console.InsufficientPermissionsException;
 
 import java.io.BufferedReader;
 import java.io.File;
diff --git a/src/com/cyanogenmod/explorer/commands/shell/ReadCommand.java b/src/com/cyanogenmod/filemanager/commands/shell/ReadCommand.java
index 72bb888e..f31d4795 100644
--- a/src/com/cyanogenmod/explorer/commands/shell/ReadCommand.java
+++ b/src/com/cyanogenmod/filemanager/commands/shell/ReadCommand.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 
-import com.cyanogenmod.explorer.commands.AsyncResultListener;
-import com.cyanogenmod.explorer.commands.ReadExecutable;
-import com.cyanogenmod.explorer.commands.SIGNAL;
-import com.cyanogenmod.explorer.console.CommandNotFoundException;
-import com.cyanogenmod.explorer.console.ExecutionException;
-import com.cyanogenmod.explorer.console.InsufficientPermissionsException;
+import com.cyanogenmod.filemanager.commands.AsyncResultListener;
+import com.cyanogenmod.filemanager.commands.ReadExecutable;
+import com.cyanogenmod.filemanager.commands.SIGNAL;
+import com.cyanogenmod.filemanager.console.CommandNotFoundException;
+import com.cyanogenmod.filemanager.console.ExecutionException;
+import com.cyanogenmod.filemanager.console.InsufficientPermissionsException;
 
 /**
  * A class for read a file
diff --git a/src/com/cyanogenmod/explorer/commands/shell/ResolveLinkCommand.java b/src/com/cyanogenmod/filemanager/commands/shell/ResolveLinkCommand.java
index dfeb908a..f3d764f1 100644
--- a/src/com/cyanogenmod/explorer/commands/shell/ResolveLinkCommand.java
+++ b/src/com/cyanogenmod/filemanager/commands/shell/ResolveLinkCommand.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 
-import com.cyanogenmod.explorer.commands.ResolveLinkExecutable;
-import com.cyanogenmod.explorer.console.CommandNotFoundException;
-import com.cyanogenmod.explorer.console.ExecutionException;
-import com.cyanogenmod.explorer.console.InsufficientPermissionsException;
-import com.cyanogenmod.explorer.model.FileSystemObject;
-import com.cyanogenmod.explorer.util.FileHelper;
-import com.cyanogenmod.explorer.util.ParseHelper;
+import com.cyanogenmod.filemanager.commands.ResolveLinkExecutable;
+import com.cyanogenmod.filemanager.console.CommandNotFoundException;
+import com.cyanogenmod.filemanager.console.ExecutionException;
+import com.cyanogenmod.filemanager.console.InsufficientPermissionsException;
+import com.cyanogenmod.filemanager.model.FileSystemObject;
+import com.cyanogenmod.filemanager.util.FileHelper;
+import com.cyanogenmod.filemanager.util.ParseHelper;
 
 import java.io.BufferedReader;
 import java.io.File;
diff --git a/src/com/cyanogenmod/explorer/commands/shell/SendSignalCommand.java b/src/com/cyanogenmod/filemanager/commands/shell/SendSignalCommand.java
index 0ba879b2..a8e9aac7 100644
--- a/src/com/cyanogenmod/explorer/commands/shell/SendSignalCommand.java
+++ b/src/com/cyanogenmod/filemanager/commands/shell/SendSignalCommand.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 
-import com.cyanogenmod.explorer.commands.SIGNAL;
-import com.cyanogenmod.explorer.commands.SendSignalExecutable;
-import com.cyanogenmod.explorer.console.CommandNotFoundException;
-import com.cyanogenmod.explorer.console.ExecutionException;
-import com.cyanogenmod.explorer.console.InsufficientPermissionsException;
+import com.cyanogenmod.filemanager.commands.SIGNAL;
+import com.cyanogenmod.filemanager.commands.SendSignalExecutable;
+import com.cyanogenmod.filemanager.console.CommandNotFoundException;
+import com.cyanogenmod.filemanager.console.ExecutionException;
+import com.cyanogenmod.filemanager.console.InsufficientPermissionsException;
 
 import java.text.ParseException;
 
diff --git a/src/com/cyanogenmod/explorer/commands/shell/Shell.java b/src/com/cyanogenmod/filemanager/commands/shell/Shell.java
index 583b5cf6..f547de95 100644
--- a/src/com/cyanogenmod/explorer/commands/shell/Shell.java
+++ b/src/com/cyanogenmod/filemanager/commands/shell/Shell.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 
-import com.cyanogenmod.explorer.commands.SyncResultExecutable;
-import com.cyanogenmod.explorer.commands.WritableExecutable;
-import com.cyanogenmod.explorer.console.CommandNotFoundException;
-import com.cyanogenmod.explorer.console.ExecutionException;
-import com.cyanogenmod.explorer.console.InsufficientPermissionsException;
-import com.cyanogenmod.explorer.console.NoSuchFileOrDirectory;
-import com.cyanogenmod.explorer.console.ReadOnlyFilesystemException;
+import com.cyanogenmod.filemanager.commands.SyncResultExecutable;
+import com.cyanogenmod.filemanager.commands.WritableExecutable;
+import com.cyanogenmod.filemanager.console.CommandNotFoundException;
+import com.cyanogenmod.filemanager.console.ExecutionException;
+import com.cyanogenmod.filemanager.console.InsufficientPermissionsException;
+import com.cyanogenmod.filemanager.console.NoSuchFileOrDirectory;
+import com.cyanogenmod.filemanager.console.ReadOnlyFilesystemException;
 
 
 /**
diff --git a/src/com/cyanogenmod/explorer/commands/shell/ShellExecutableCreator.java b/src/com/cyanogenmod/filemanager/commands/shell/ShellExecutableCreator.java
index 3d060fec..4eabd8f3 100644
--- a/src/com/cyanogenmod/explorer/commands/shell/ShellExecutableCreator.java
+++ b/src/com/cyanogenmod/filemanager/commands/shell/ShellExecutableCreator.java
@@ -14,49 +14,49 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
-
-import com.cyanogenmod.explorer.commands.AsyncResultListener;
-import com.cyanogenmod.explorer.commands.ChangeCurrentDirExecutable;
-import com.cyanogenmod.explorer.commands.ChangeOwnerExecutable;
-import com.cyanogenmod.explorer.commands.ChangePermissionsExecutable;
-import com.cyanogenmod.explorer.commands.CompressExecutable;
-import com.cyanogenmod.explorer.commands.CopyExecutable;
-import com.cyanogenmod.explorer.commands.CreateDirExecutable;
-import com.cyanogenmod.explorer.commands.CreateFileExecutable;
-import com.cyanogenmod.explorer.commands.CurrentDirExecutable;
-import com.cyanogenmod.explorer.commands.DeleteDirExecutable;
-import com.cyanogenmod.explorer.commands.DeleteFileExecutable;
-import com.cyanogenmod.explorer.commands.DiskUsageExecutable;
-import com.cyanogenmod.explorer.commands.EchoExecutable;
-import com.cyanogenmod.explorer.commands.ExecExecutable;
-import com.cyanogenmod.explorer.commands.ExecutableCreator;
-import com.cyanogenmod.explorer.commands.FindExecutable;
-import com.cyanogenmod.explorer.commands.FolderUsageExecutable;
-import com.cyanogenmod.explorer.commands.GroupsExecutable;
-import com.cyanogenmod.explorer.commands.IdentityExecutable;
-import com.cyanogenmod.explorer.commands.LinkExecutable;
-import com.cyanogenmod.explorer.commands.ListExecutable;
-import com.cyanogenmod.explorer.commands.MountExecutable;
-import com.cyanogenmod.explorer.commands.MountPointInfoExecutable;
-import com.cyanogenmod.explorer.commands.MoveExecutable;
-import com.cyanogenmod.explorer.commands.ParentDirExecutable;
-import com.cyanogenmod.explorer.commands.ProcessIdExecutable;
-import com.cyanogenmod.explorer.commands.QuickFolderSearchExecutable;
-import com.cyanogenmod.explorer.commands.ReadExecutable;
-import com.cyanogenmod.explorer.commands.ResolveLinkExecutable;
-import com.cyanogenmod.explorer.commands.SIGNAL;
-import com.cyanogenmod.explorer.commands.SendSignalExecutable;
-import com.cyanogenmod.explorer.commands.UncompressExecutable;
-import com.cyanogenmod.explorer.commands.WriteExecutable;
-import com.cyanogenmod.explorer.console.CommandNotFoundException;
-import com.cyanogenmod.explorer.console.shell.ShellConsole;
-import com.cyanogenmod.explorer.model.Group;
-import com.cyanogenmod.explorer.model.MountPoint;
-import com.cyanogenmod.explorer.model.Permissions;
-import com.cyanogenmod.explorer.model.Query;
-import com.cyanogenmod.explorer.model.User;
-import com.cyanogenmod.explorer.preferences.CompressionMode;
+package com.cyanogenmod.filemanager.commands.shell;
+
+import com.cyanogenmod.filemanager.commands.AsyncResultListener;
+import com.cyanogenmod.filemanager.commands.ChangeCurrentDirExecutable;
+import com.cyanogenmod.filemanager.commands.ChangeOwnerExecutable;
+import com.cyanogenmod.filemanager.commands.ChangePermissionsExecutable;
+import com.cyanogenmod.filemanager.commands.CompressExecutable;
+import com.cyanogenmod.filemanager.commands.CopyExecutable;
+import com.cyanogenmod.filemanager.commands.CreateDirExecutable;
+import com.cyanogenmod.filemanager.commands.CreateFileExecutable;
+import com.cyanogenmod.filemanager.commands.CurrentDirExecutable;
+import com.cyanogenmod.filemanager.commands.DeleteDirExecutable;
+import com.cyanogenmod.filemanager.commands.DeleteFileExecutable;
+import com.cyanogenmod.filemanager.commands.DiskUsageExecutable;
+import com.cyanogenmod.filemanager.commands.EchoExecutable;
+import com.cyanogenmod.filemanager.commands.ExecExecutable;
+import com.cyanogenmod.filemanager.commands.ExecutableCreator;
+import com.cyanogenmod.filemanager.commands.FindExecutable;
+import com.cyanogenmod.filemanager.commands.FolderUsageExecutable;
+import com.cyanogenmod.filemanager.commands.GroupsExecutable;
+import com.cyanogenmod.filemanager.commands.IdentityExecutable;
+import com.cyanogenmod.filemanager.commands.LinkExecutable;
+import com.cyanogenmod.filemanager.commands.ListExecutable;
+import com.cyanogenmod.filemanager.commands.MountExecutable;
+import com.cyanogenmod.filemanager.commands.MountPointInfoExecutable;
+import com.cyanogenmod.filemanager.commands.MoveExecutable;
+import com.cyanogenmod.filemanager.commands.ParentDirExecutable;
+import com.cyanogenmod.filemanager.commands.ProcessIdExecutable;
+import com.cyanogenmod.filemanager.commands.QuickFolderSearchExecutable;
+import com.cyanogenmod.filemanager.commands.ReadExecutable;
+import com.cyanogenmod.filemanager.commands.ResolveLinkExecutable;
+import com.cyanogenmod.filemanager.commands.SIGNAL;
+import com.cyanogenmod.filemanager.commands.SendSignalExecutable;
+import com.cyanogenmod.filemanager.commands.UncompressExecutable;
+import com.cyanogenmod.filemanager.commands.WriteExecutable;
+import com.cyanogenmod.filemanager.console.CommandNotFoundException;
+import com.cyanogenmod.filemanager.console.shell.ShellConsole;
+import com.cyanogenmod.filemanager.model.Group;
+import com.cyanogenmod.filemanager.model.MountPoint;
+import com.cyanogenmod.filemanager.model.Permissions;
+import com.cyanogenmod.filemanager.model.Query;
+import com.cyanogenmod.filemanager.model.User;
+import com.cyanogenmod.filemanager.preferences.CompressionMode;
 
 /**
  * A class for create shell {@link "Executable"} objects.
diff --git a/src/com/cyanogenmod/explorer/commands/shell/ShellExecutableFactory.java b/src/com/cyanogenmod/filemanager/commands/shell/ShellExecutableFactory.java
index bd2db0da..52fe170b 100644
--- a/src/com/cyanogenmod/explorer/commands/shell/ShellExecutableFactory.java
+++ b/src/com/cyanogenmod/filemanager/commands/shell/ShellExecutableFactory.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 
-import com.cyanogenmod.explorer.commands.ExecutableCreator;
-import com.cyanogenmod.explorer.commands.ExecutableFactory;
-import com.cyanogenmod.explorer.console.shell.ShellConsole;
+import com.cyanogenmod.filemanager.commands.ExecutableCreator;
+import com.cyanogenmod.filemanager.commands.ExecutableFactory;
+import com.cyanogenmod.filemanager.console.shell.ShellConsole;
 
 /**
  * A class that represents a factory for creating shell {@link "Executable"} objects.
diff --git a/src/com/cyanogenmod/explorer/commands/shell/SuperuserShell.java b/src/com/cyanogenmod/filemanager/commands/shell/SuperuserShell.java
index c1a73335..d693137d 100644
--- a/src/com/cyanogenmod/explorer/commands/shell/SuperuserShell.java
+++ b/src/com/cyanogenmod/filemanager/commands/shell/SuperuserShell.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 
-import com.cyanogenmod.explorer.console.CommandNotFoundException;
-import com.cyanogenmod.explorer.console.ExecutionException;
-import com.cyanogenmod.explorer.console.InsufficientPermissionsException;
-import com.cyanogenmod.explorer.console.NoSuchFileOrDirectory;
-import com.cyanogenmod.explorer.console.ReadOnlyFilesystemException;
-import com.cyanogenmod.explorer.util.ShellHelper;
+import com.cyanogenmod.filemanager.console.CommandNotFoundException;
+import com.cyanogenmod.filemanager.console.ExecutionException;
+import com.cyanogenmod.filemanager.console.InsufficientPermissionsException;
+import com.cyanogenmod.filemanager.console.NoSuchFileOrDirectory;
+import com.cyanogenmod.filemanager.console.ReadOnlyFilesystemException;
+import com.cyanogenmod.filemanager.util.ShellHelper;
 
 
 
diff --git a/src/com/cyanogenmod/explorer/commands/shell/SyncResultProgram.java b/src/com/cyanogenmod/filemanager/commands/shell/SyncResultProgram.java
index 68cdd681..ef363b9c 100644
--- a/src/com/cyanogenmod/explorer/commands/shell/SyncResultProgram.java
+++ b/src/com/cyanogenmod/filemanager/commands/shell/SyncResultProgram.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 
 /**
  * An abstract class that allow the consumption of the data when it's totally recovery.
diff --git a/src/com/cyanogenmod/explorer/commands/shell/SyncResultProgramListener.java b/src/com/cyanogenmod/filemanager/commands/shell/SyncResultProgramListener.java
index c2d1c00d..56585b00 100644
--- a/src/com/cyanogenmod/explorer/commands/shell/SyncResultProgramListener.java
+++ b/src/com/cyanogenmod/filemanager/commands/shell/SyncResultProgramListener.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 
 import java.text.ParseException;
 
diff --git a/src/com/cyanogenmod/explorer/commands/shell/UncompressCommand.java b/src/com/cyanogenmod/filemanager/commands/shell/UncompressCommand.java
index de4a292f..a4d277f9 100644
--- a/src/com/cyanogenmod/explorer/commands/shell/UncompressCommand.java
+++ b/src/com/cyanogenmod/filemanager/commands/shell/UncompressCommand.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
-
-import com.cyanogenmod.explorer.commands.AsyncResultListener;
-import com.cyanogenmod.explorer.commands.SIGNAL;
-import com.cyanogenmod.explorer.commands.UncompressExecutable;
-import com.cyanogenmod.explorer.console.CommandNotFoundException;
-import com.cyanogenmod.explorer.console.ExecutionException;
-import com.cyanogenmod.explorer.console.InsufficientPermissionsException;
-import com.cyanogenmod.explorer.preferences.UncompressionMode;
-import com.cyanogenmod.explorer.util.FileHelper;
+package com.cyanogenmod.filemanager.commands.shell;
+
+import com.cyanogenmod.filemanager.commands.AsyncResultListener;
+import com.cyanogenmod.filemanager.commands.SIGNAL;
+import com.cyanogenmod.filemanager.commands.UncompressExecutable;
+import com.cyanogenmod.filemanager.console.CommandNotFoundException;
+import com.cyanogenmod.filemanager.console.ExecutionException;
+import com.cyanogenmod.filemanager.console.InsufficientPermissionsException;
+import com.cyanogenmod.filemanager.preferences.UncompressionMode;
+import com.cyanogenmod.filemanager.util.FileHelper;
 
 import java.io.File;
 
diff --git a/src/com/cyanogenmod/explorer/commands/shell/WriteCommand.java b/src/com/cyanogenmod/filemanager/commands/shell/WriteCommand.java
index d574e514..08968305 100644
--- a/src/com/cyanogenmod/explorer/commands/shell/WriteCommand.java
+++ b/src/com/cyanogenmod/filemanager/commands/shell/WriteCommand.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
-
-import com.cyanogenmod.explorer.commands.AsyncResultListener;
-import com.cyanogenmod.explorer.commands.SIGNAL;
-import com.cyanogenmod.explorer.commands.WriteExecutable;
-import com.cyanogenmod.explorer.console.CommandNotFoundException;
-import com.cyanogenmod.explorer.console.ExecutionException;
-import com.cyanogenmod.explorer.console.InsufficientPermissionsException;
+package com.cyanogenmod.filemanager.commands.shell;
+
+import com.cyanogenmod.filemanager.commands.AsyncResultListener;
+import com.cyanogenmod.filemanager.commands.SIGNAL;
+import com.cyanogenmod.filemanager.commands.WriteExecutable;
+import com.cyanogenmod.filemanager.console.CommandNotFoundException;
+import com.cyanogenmod.filemanager.console.ExecutionException;
+import com.cyanogenmod.filemanager.console.InsufficientPermissionsException;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/src/com/cyanogenmod/explorer/console/CommandNotFoundException.java b/src/com/cyanogenmod/filemanager/console/CommandNotFoundException.java
index 609c9e4a..cca7db2a 100644
--- a/src/com/cyanogenmod/explorer/console/CommandNotFoundException.java
+++ b/src/com/cyanogenmod/filemanager/console/CommandNotFoundException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.console;
+package com.cyanogenmod.filemanager.console;
 
 /**
  * An exception thrown when the command was not found
diff --git a/src/com/cyanogenmod/explorer/console/Console.java b/src/com/cyanogenmod/filemanager/console/Console.java
index db53cf14..ba28db55 100644
--- a/src/com/cyanogenmod/explorer/console/Console.java
+++ b/src/com/cyanogenmod/filemanager/console/Console.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.cyanogenmod.explorer.console;
+package com.cyanogenmod.filemanager.console;
 
-import com.cyanogenmod.explorer.commands.AsyncResultExecutable;
-import com.cyanogenmod.explorer.commands.Executable;
-import com.cyanogenmod.explorer.commands.ExecutableFactory;
-import com.cyanogenmod.explorer.model.Identity;
-import com.cyanogenmod.explorer.preferences.ExplorerSettings;
-import com.cyanogenmod.explorer.preferences.Preferences;
+import com.cyanogenmod.filemanager.commands.AsyncResultExecutable;
+import com.cyanogenmod.filemanager.commands.Executable;
+import com.cyanogenmod.filemanager.commands.ExecutableFactory;
+import com.cyanogenmod.filemanager.model.Identity;
+import com.cyanogenmod.filemanager.preferences.FileManagerSettings;
+import com.cyanogenmod.filemanager.preferences.Preferences;
 
 /**
  * This class represents a class for executing commands in the operating system layer,
@@ -55,8 +55,8 @@ public abstract class Console
      */
     public final void reloadTrace() {
         this.mTrace = Preferences.getSharedPreferences().getBoolean(
-                ExplorerSettings.SETTINGS_SHOW_TRACES.getId(),
-                ((Boolean)ExplorerSettings.SETTINGS_SHOW_TRACES.getDefaultValue()).booleanValue());
+                FileManagerSettings.SETTINGS_SHOW_TRACES.getId(),
+                ((Boolean)FileManagerSettings.SETTINGS_SHOW_TRACES.getDefaultValue()).booleanValue());
     }
 
     /**
diff --git a/src/com/cyanogenmod/explorer/console/ConsoleAllocException.java b/src/com/cyanogenmod/filemanager/console/ConsoleAllocException.java
index bb68ffe7..ade454a6 100644
--- a/src/com/cyanogenmod/explorer/console/ConsoleAllocException.java
+++ b/src/com/cyanogenmod/filemanager/console/ConsoleAllocException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.console;
+package com.cyanogenmod.filemanager.console;
 
 /**
  * An exception thrown when an exception occurs allocating a console.
diff --git a/src/com/cyanogenmod/explorer/console/ConsoleBuilder.java b/src/com/cyanogenmod/filemanager/console/ConsoleBuilder.java
index f1c28ebb..cd5109f1 100644
--- a/src/com/cyanogenmod/explorer/console/ConsoleBuilder.java
+++ b/src/com/cyanogenmod/filemanager/console/ConsoleBuilder.java
@@ -14,22 +14,22 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.console;
+package com.cyanogenmod.filemanager.console;
 
 import android.content.Context;
 import android.util.Log;
 import android.widget.Toast;
 
-import com.cyanogenmod.explorer.ExplorerApplication;
-import com.cyanogenmod.explorer.R;
-import com.cyanogenmod.explorer.commands.shell.InvalidCommandDefinitionException;
-import com.cyanogenmod.explorer.console.java.JavaConsole;
-import com.cyanogenmod.explorer.console.shell.NonPriviledgeConsole;
-import com.cyanogenmod.explorer.console.shell.PrivilegedConsole;
-import com.cyanogenmod.explorer.preferences.ExplorerSettings;
-import com.cyanogenmod.explorer.preferences.Preferences;
-import com.cyanogenmod.explorer.util.DialogHelper;
-import com.cyanogenmod.explorer.util.FileHelper;
+import com.cyanogenmod.filemanager.FileManagerApplication;
+import com.cyanogenmod.filemanager.R;
+import com.cyanogenmod.filemanager.commands.shell.InvalidCommandDefinitionException;
+import com.cyanogenmod.filemanager.console.java.JavaConsole;
+import com.cyanogenmod.filemanager.console.shell.NonPriviledgeConsole;
+import com.cyanogenmod.filemanager.console.shell.PrivilegedConsole;
+import com.cyanogenmod.filemanager.preferences.FileManagerSettings;
+import com.cyanogenmod.filemanager.preferences.Preferences;
+import com.cyanogenmod.filemanager.util.DialogHelper;
+import com.cyanogenmod.filemanager.util.FileHelper;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -154,7 +154,7 @@ public final class ConsoleBuilder {
             sHolder = holder;
 
             // Change also the background console to privileged
-            ExplorerApplication.changeBackgroundConsoleToPriviligedConsole();
+            FileManagerApplication.changeBackgroundConsoleToPriviligedConsole();
 
             return sHolder.getConsole() instanceof PrivilegedConsole;
 
@@ -184,12 +184,12 @@ public final class ConsoleBuilder {
             throws FileNotFoundException, IOException, InvalidCommandDefinitionException,
             ConsoleAllocException, InsufficientPermissionsException {
         //Gets superuser mode settings
-        boolean superuserMode = ExplorerApplication.isSuperuserMode();
-        boolean advancedMode = ExplorerApplication.isAdvancedMode();
+        boolean superuserMode = FileManagerApplication.isSuperuserMode();
+        boolean advancedMode = FileManagerApplication.isAdvancedMode();
         if (superuserMode && !advancedMode) {
             try {
                 Preferences.savePreference(
-                        ExplorerSettings.SETTINGS_SUPERUSER_MODE, Boolean.FALSE, true);
+                        FileManagerSettings.SETTINGS_SUPERUSER_MODE, Boolean.FALSE, true);
             } catch (Throwable ex) {
                 Log.w(TAG, "can't save console preference", ex); //$NON-NLS-1$
             }
@@ -240,7 +240,7 @@ public final class ConsoleBuilder {
                                 createNonPrivilegedConsole(context, FileHelper.ROOT_DIRECTORY));
                 if (superuserMode) {
                     // Change also the background console to privileged
-                    ExplorerApplication.changeBackgroundConsoleToPriviligedConsole();
+                    FileManagerApplication.changeBackgroundConsoleToPriviligedConsole();
                 }
             }
             return sHolder.getConsole();
@@ -280,7 +280,7 @@ public final class ConsoleBuilder {
         int bufferSize = context.getResources().getInteger(R.integer.buffer_size);
 
         // Is rooted? Then create a shell console
-        if (ExplorerApplication.isDeviceRooted()) {
+        if (FileManagerApplication.isDeviceRooted()) {
             NonPriviledgeConsole console = new NonPriviledgeConsole(initialDirectory);
             console.setBufferSize(bufferSize);
             console.alloc();
@@ -390,16 +390,16 @@ public final class ConsoleBuilder {
                 }
             }
 
-            boolean advancedMode = ExplorerApplication.isAdvancedMode();
+            boolean advancedMode = FileManagerApplication.isAdvancedMode();
             if (advancedMode) {
                 //Save settings
                 try {
                     Preferences.savePreference(
-                            ExplorerSettings.SETTINGS_SUPERUSER_MODE, Boolean.FALSE, true);
+                            FileManagerSettings.SETTINGS_SUPERUSER_MODE, Boolean.FALSE, true);
                 } catch (Exception ex) {
                     Log.e(TAG,
                             String.format("Failed to save %s property",  //$NON-NLS-1$
-                            ExplorerSettings.SETTINGS_SUPERUSER_MODE.getId()), ex);
+                            FileManagerSettings.SETTINGS_SUPERUSER_MODE.getId()), ex);
                 }
 
                 //Create the non-privileged console
diff --git a/src/com/cyanogenmod/explorer/console/ConsoleHolder.java b/src/com/cyanogenmod/filemanager/console/ConsoleHolder.java
index 6120ee78..cb3e8686 100644
--- a/src/com/cyanogenmod/explorer/console/ConsoleHolder.java
+++ b/src/com/cyanogenmod/filemanager/console/ConsoleHolder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.console;
+package com.cyanogenmod.filemanager.console;
 
 /**
  * A class that holds a console.
diff --git a/src/com/cyanogenmod/explorer/console/ExecutionException.java b/src/com/cyanogenmod/filemanager/console/ExecutionException.java
index b1c4aee1..e05d35e2 100644
--- a/src/com/cyanogenmod/explorer/console/ExecutionException.java
+++ b/src/com/cyanogenmod/filemanager/console/ExecutionException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.console;
+package com.cyanogenmod.filemanager.console;
 
 /**
  * An exception thrown when an operation invocation fails.
diff --git a/src/com/cyanogenmod/explorer/console/InsufficientPermissionsException.java b/src/com/cyanogenmod/filemanager/console/InsufficientPermissionsException.java
index 516b680a..614e5609 100644
--- a/src/com/cyanogenmod/explorer/console/InsufficientPermissionsException.java
+++ b/src/com/cyanogenmod/filemanager/console/InsufficientPermissionsException.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.console;
+package com.cyanogenmod.filemanager.console;
 
-import com.cyanogenmod.explorer.R;
-import com.cyanogenmod.explorer.commands.SyncResultExecutable;
+import com.cyanogenmod.filemanager.R;
+import com.cyanogenmod.filemanager.commands.SyncResultExecutable;
 
 /**
  * An exception thrown when an operation required elevated permissions.
diff --git a/src/com/cyanogenmod/explorer/console/NoSuchFileOrDirectory.java b/src/com/cyanogenmod/filemanager/console/NoSuchFileOrDirectory.java
index 7a5eaed9..a2e87c7b 100644
--- a/src/com/cyanogenmod/explorer/console/NoSuchFileOrDirectory.java
+++ b/src/com/cyanogenmod/filemanager/console/NoSuchFileOrDirectory.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.console;
+package com.cyanogenmod.filemanager.console;
 
 /**
  * An exception thrown when the file or directory is not found.
diff --git a/src/com/cyanogenmod/explorer/console/OperationTimeoutException.java b/src/com/cyanogenmod/filemanager/console/OperationTimeoutException.java
index dcce809b..c549fda0 100644
--- a/src/com/cyanogenmod/explorer/console/OperationTimeoutException.java
+++ b/src/com/cyanogenmod/filemanager/console/OperationTimeoutException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.console;
+package com.cyanogenmod.filemanager.console;
 
 /**
  * An exception thrown when the operation exceeds the timeout.
diff --git a/src/com/cyanogenmod/explorer/console/ReadOnlyFilesystemException.java b/src/com/cyanogenmod/filemanager/console/ReadOnlyFilesystemException.java
index 25cc805e..6e26146b 100644
--- a/src/com/cyanogenmod/explorer/console/ReadOnlyFilesystemException.java
+++ b/src/com/cyanogenmod/filemanager/console/ReadOnlyFilesystemException.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.console;
+package com.cyanogenmod.filemanager.console;
 
-import com.cyanogenmod.explorer.model.MountPoint;
+import com.cyanogenmod.filemanager.model.MountPoint;
 
 /**
  * An exception thrown when an operation is writing in a read-only filesystem.
diff --git a/src/com/cyanogenmod/explorer/console/RelaunchableException.java b/src/com/cyanogenmod/filemanager/console/RelaunchableException.java
index bbcde333..db5ece7b 100644
--- a/src/com/cyanogenmod/explorer/console/RelaunchableException.java
+++ b/src/com/cyanogenmod/filemanager/console/RelaunchableException.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.console;
+package com.cyanogenmod.filemanager.console;
 
 import android.os.AsyncTask;
 
-import com.cyanogenmod.explorer.commands.SyncResultExecutable;
+import com.cyanogenmod.filemanager.commands.SyncResultExecutable;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/cyanogenmod/explorer/console/java/JavaConsole.java b/src/com/cyanogenmod/filemanager/console/java/JavaConsole.java
index e8973d06..df04d4a5 100644
--- a/src/com/cyanogenmod/explorer/console/java/JavaConsole.java
+++ b/src/com/cyanogenmod/filemanager/console/java/JavaConsole.java
@@ -14,28 +14,28 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.console.java;
+package com.cyanogenmod.filemanager.console.java;
 
 import android.content.Context;
 import android.os.storage.StorageVolume;
 import android.util.Log;
 
-import com.cyanogenmod.explorer.commands.ChangeCurrentDirExecutable;
-import com.cyanogenmod.explorer.commands.Executable;
-import com.cyanogenmod.explorer.commands.ExecutableFactory;
-import com.cyanogenmod.explorer.commands.SIGNAL;
-import com.cyanogenmod.explorer.commands.java.JavaExecutableFactory;
-import com.cyanogenmod.explorer.commands.java.Program;
-import com.cyanogenmod.explorer.console.CommandNotFoundException;
-import com.cyanogenmod.explorer.console.Console;
-import com.cyanogenmod.explorer.console.ConsoleAllocException;
-import com.cyanogenmod.explorer.console.ExecutionException;
-import com.cyanogenmod.explorer.console.InsufficientPermissionsException;
-import com.cyanogenmod.explorer.console.NoSuchFileOrDirectory;
-import com.cyanogenmod.explorer.console.OperationTimeoutException;
-import com.cyanogenmod.explorer.console.ReadOnlyFilesystemException;
-import com.cyanogenmod.explorer.model.Identity;
-import com.cyanogenmod.explorer.util.StorageHelper;
+import com.cyanogenmod.filemanager.commands.ChangeCurrentDirExecutable;
+import com.cyanogenmod.filemanager.commands.Executable;
+import com.cyanogenmod.filemanager.commands.ExecutableFactory;
+import com.cyanogenmod.filemanager.commands.SIGNAL;
+import com.cyanogenmod.filemanager.commands.java.JavaExecutableFactory;
+import com.cyanogenmod.filemanager.commands.java.Program;
+import com.cyanogenmod.filemanager.console.CommandNotFoundException;
+import com.cyanogenmod.filemanager.console.Console;
+import com.cyanogenmod.filemanager.console.ConsoleAllocException;
+import com.cyanogenmod.filemanager.console.ExecutionException;
+import com.cyanogenmod.filemanager.console.InsufficientPermissionsException;
+import com.cyanogenmod.filemanager.console.NoSuchFileOrDirectory;
+import com.cyanogenmod.filemanager.console.OperationTimeoutException;
+import com.cyanogenmod.filemanager.console.ReadOnlyFilesystemException;
+import com.cyanogenmod.filemanager.model.Identity;
+import com.cyanogenmod.filemanager.util.StorageHelper;
 
 /**
  * An implementation of a {@link Console} based on a java implementation.<br/>
diff --git a/src/com/cyanogenmod/explorer/console/shell/NonPriviledgeConsole.java b/src/com/cyanogenmod/filemanager/console/shell/NonPriviledgeConsole.java
index 2ccaab74..aec764f8 100644
--- a/src/com/cyanogenmod/explorer/console/shell/NonPriviledgeConsole.java
+++ b/src/com/cyanogenmod/filemanager/console/shell/NonPriviledgeConsole.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.console.shell;
+package com.cyanogenmod.filemanager.console.shell;
 
-import com.cyanogenmod.explorer.commands.shell.BashShell;
-import com.cyanogenmod.explorer.commands.shell.InvalidCommandDefinitionException;
+import com.cyanogenmod.filemanager.commands.shell.BashShell;
+import com.cyanogenmod.filemanager.commands.shell.InvalidCommandDefinitionException;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
diff --git a/src/com/cyanogenmod/explorer/console/shell/PrivilegedConsole.java b/src/com/cyanogenmod/filemanager/console/shell/PrivilegedConsole.java
index 4a3e36ee..4e5d3088 100644
--- a/src/com/cyanogenmod/explorer/console/shell/PrivilegedConsole.java
+++ b/src/com/cyanogenmod/filemanager/console/shell/PrivilegedConsole.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.console.shell;
+package com.cyanogenmod.filemanager.console.shell;
 
-import com.cyanogenmod.explorer.commands.shell.InvalidCommandDefinitionException;
-import com.cyanogenmod.explorer.commands.shell.SuperuserShell;
+import com.cyanogenmod.filemanager.commands.shell.InvalidCommandDefinitionException;
+import com.cyanogenmod.filemanager.commands.shell.SuperuserShell;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
diff --git a/src/com/cyanogenmod/explorer/console/shell/ShellConsole.java b/src/com/cyanogenmod/filemanager/console/shell/ShellConsole.java
index 31515be2..b7ddf990 100644
--- a/src/com/cyanogenmod/explorer/console/shell/ShellConsole.java
+++ b/src/com/cyanogenmod/filemanager/console/shell/ShellConsole.java
@@ -14,38 +14,38 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.console.shell;
+package com.cyanogenmod.filemanager.console.shell;
 
 import android.util.Log;
 
-import com.cyanogenmod.explorer.ExplorerApplication;
-import com.cyanogenmod.explorer.commands.AsyncResultExecutable;
-import com.cyanogenmod.explorer.commands.Executable;
-import com.cyanogenmod.explorer.commands.ExecutableFactory;
-import com.cyanogenmod.explorer.commands.GroupsExecutable;
-import com.cyanogenmod.explorer.commands.IdentityExecutable;
-import com.cyanogenmod.explorer.commands.ProcessIdExecutable;
-import com.cyanogenmod.explorer.commands.SIGNAL;
-import com.cyanogenmod.explorer.commands.shell.AsyncResultProgram;
-import com.cyanogenmod.explorer.commands.shell.Command;
-import com.cyanogenmod.explorer.commands.shell.InvalidCommandDefinitionException;
-import com.cyanogenmod.explorer.commands.shell.Program;
-import com.cyanogenmod.explorer.commands.shell.Shell;
-import com.cyanogenmod.explorer.commands.shell.ShellExecutableFactory;
-import com.cyanogenmod.explorer.commands.shell.SyncResultProgram;
-import com.cyanogenmod.explorer.console.CommandNotFoundException;
-import com.cyanogenmod.explorer.console.Console;
-import com.cyanogenmod.explorer.console.ConsoleAllocException;
-import com.cyanogenmod.explorer.console.ExecutionException;
-import com.cyanogenmod.explorer.console.InsufficientPermissionsException;
-import com.cyanogenmod.explorer.console.NoSuchFileOrDirectory;
-import com.cyanogenmod.explorer.console.OperationTimeoutException;
-import com.cyanogenmod.explorer.console.ReadOnlyFilesystemException;
-import com.cyanogenmod.explorer.model.Identity;
-import com.cyanogenmod.explorer.preferences.ExplorerSettings;
-import com.cyanogenmod.explorer.preferences.Preferences;
-import com.cyanogenmod.explorer.util.CommandHelper;
-import com.cyanogenmod.explorer.util.FileHelper;
+import com.cyanogenmod.filemanager.FileManagerApplication;
+import com.cyanogenmod.filemanager.commands.AsyncResultExecutable;
+import com.cyanogenmod.filemanager.commands.Executable;
+import com.cyanogenmod.filemanager.commands.ExecutableFactory;
+import com.cyanogenmod.filemanager.commands.GroupsExecutable;
+import com.cyanogenmod.filemanager.commands.IdentityExecutable;
+import com.cyanogenmod.filemanager.commands.ProcessIdExecutable;
+import com.cyanogenmod.filemanager.commands.SIGNAL;
+import com.cyanogenmod.filemanager.commands.shell.AsyncResultProgram;
+import com.cyanogenmod.filemanager.commands.shell.Command;
+import com.cyanogenmod.filemanager.commands.shell.InvalidCommandDefinitionException;
+import com.cyanogenmod.filemanager.commands.shell.Program;
+import com.cyanogenmod.filemanager.commands.shell.Shell;
+import com.cyanogenmod.filemanager.commands.shell.ShellExecutableFactory;
+import com.cyanogenmod.filemanager.commands.shell.SyncResultProgram;
+import com.cyanogenmod.filemanager.console.CommandNotFoundException;
+import com.cyanogenmod.filemanager.console.Console;
+import com.cyanogenmod.filemanager.console.ConsoleAllocException;
+import com.cyanogenmod.filemanager.console.ExecutionException;
+import com.cyanogenmod.filemanager.console.InsufficientPermissionsException;
+import com.cyanogenmod.filemanager.console.NoSuchFileOrDirectory;
+import com.cyanogenmod.filemanager.console.OperationTimeoutException;
+import com.cyanogenmod.filemanager.console.ReadOnlyFilesystemException;
+import com.cyanogenmod.filemanager.model.Identity;
+import com.cyanogenmod.filemanager.preferences.FileManagerSettings;
+import com.cyanogenmod.filemanager.preferences.Preferences;
+import com.cyanogenmod.filemanager.util.CommandHelper;
+import com.cyanogenmod.filemanager.util.FileHelper;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -72,7 +72,7 @@ public abstract class ShellConsole extends Console implements Program.ProgramLis
 
     // A timeout of 5 seconds should be enough for no-debugging environments
     private static final long DEFAULT_TIMEOUT =
-            ExplorerApplication.isDebuggable() ? 20000L : 5000L;
+            FileManagerApplication.isDebuggable() ? 20000L : 5000L;
 
     private static final int DEFAULT_BUFFER = 512;
 
@@ -139,8 +139,8 @@ public abstract class ShellConsole extends Console implements Program.ProgramLis
      */
     public ShellConsole(Shell shell) throws FileNotFoundException, IOException {
         this(shell, Preferences.getSharedPreferences().getString(
-                            ExplorerSettings.SETTINGS_INITIAL_DIR.getId(),
-                            (String)ExplorerSettings.SETTINGS_INITIAL_DIR.getDefaultValue()));
+                            FileManagerSettings.SETTINGS_INITIAL_DIR.getId(),
+                            (String)FileManagerSettings.SETTINGS_INITIAL_DIR.getDefaultValue()));
     }
 
     /**
@@ -500,13 +500,13 @@ public abstract class ShellConsole extends Console implements Program.ProgramLis
                 this.mEndControlPattern = endId1 + "\\d{1,3}" + endId2; //$NON-NLS-1$
                 String startCmd =
                         Command.getStartCodeCommandInfo(
-                                ExplorerApplication.getInstance().getResources());
+                                FileManagerApplication.getInstance().getResources());
                 startCmd = String.format(
                         startCmd, "'" + startId1 +//$NON-NLS-1$
                         "'", "'" + startId2 + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 String endCmd =
                         Command.getExitCodeCommandInfo(
-                                ExplorerApplication.getInstance().getResources());
+                                FileManagerApplication.getInstance().getResources());
                 endCmd = String.format(
                         endCmd, "'" + endId1 + //$NON-NLS-1$
                         "'", "'" + endId2 + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -1064,7 +1064,7 @@ public abstract class ShellConsole extends Console implements Program.ProgramLis
             }
             // Check background console
             try {
-                ExplorerApplication.getBackgroundConsole();
+                FileManagerApplication.getBackgroundConsole();
             } catch (Exception e) {
                 Log.w(TAG, "There is not background console. Not allowed.", e); //$NON-NLS-1$
                 return false;
@@ -1080,12 +1080,12 @@ public abstract class ShellConsole extends Console implements Program.ProgramLis
                                         null,
                                         this.mShell.getPid(),
                                         program.getCommand(),
-                                        ExplorerApplication.getBackgroundConsole());
+                                        FileManagerApplication.getBackgroundConsole());
                         if (pid != null) {
                             CommandHelper.sendSignal(
                                     null,
                                     pid.intValue(),
-                                    ExplorerApplication.getBackgroundConsole());
+                                    FileManagerApplication.getBackgroundConsole());
                             try {
                                 //Wait for process kill
                                 Thread.sleep(100L);
@@ -1123,7 +1123,7 @@ public abstract class ShellConsole extends Console implements Program.ProgramLis
             }
             // Check background console
             try {
-                ExplorerApplication.getBackgroundConsole();
+                FileManagerApplication.getBackgroundConsole();
             } catch (Exception e) {
                 Log.w(TAG, "There is not background console. Not allowed.", e); //$NON-NLS-1$
                 return false;
@@ -1140,13 +1140,13 @@ public abstract class ShellConsole extends Console implements Program.ProgramLis
                                             null,
                                             this.mShell.getPid(),
                                             program.getCommand(),
-                                            ExplorerApplication.getBackgroundConsole());
+                                            FileManagerApplication.getBackgroundConsole());
                             if (pid != null) {
                                 CommandHelper.sendSignal(
                                         null,
                                         pid.intValue(),
                                         signal,
-                                        ExplorerApplication.getBackgroundConsole());
+                                        FileManagerApplication.getBackgroundConsole());
                                 try {
                                     //Wait for process kill
                                     Thread.sleep(100L);
diff --git a/src/com/cyanogenmod/explorer/listeners/OnHistoryListener.java b/src/com/cyanogenmod/filemanager/listeners/OnHistoryListener.java
index d38a1431..a0ba5160 100644
--- a/src/com/cyanogenmod/explorer/listeners/OnHistoryListener.java
+++ b/src/com/cyanogenmod/filemanager/listeners/OnHistoryListener.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.listeners;
+package com.cyanogenmod.filemanager.listeners;
 
-import com.cyanogenmod.explorer.parcelables.HistoryNavigable;
+import com.cyanogenmod.filemanager.parcelables.HistoryNavigable;
 
 /**
  * A listener for communicate history changes.
diff --git a/src/com/cyanogenmod/explorer/listeners/OnRequestRefreshListener.java b/src/com/cyanogenmod/filemanager/listeners/OnRequestRefreshListener.java
index b103f10b..216b787b 100644
--- a/src/com/cyanogenmod/explorer/listeners/OnRequestRefreshListener.java
+++ b/src/com/cyanogenmod/filemanager/listeners/OnRequestRefreshListener.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.listeners;
+package com.cyanogenmod.filemanager.listeners;
 
 /**
  * A listener for requesting an object refresh.
diff --git a/src/com/cyanogenmod/explorer/listeners/OnSelectionListener.java b/src/com/cyanogenmod/filemanager/listeners/OnSelectionListener.java
index c92db8a0..11ee1124 100644
--- a/src/com/cyanogenmod/explorer/listeners/OnSelectionListener.java
+++ b/src/com/cyanogenmod/filemanager/listeners/OnSelectionListener.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.listeners;
+package com.cyanogenmod.filemanager.listeners;
 
-import com.cyanogenmod.explorer.model.FileSystemObject;
+import com.cyanogenmod.filemanager.model.FileSystemObject;
 
 import java.util.List;
 
diff --git a/src/com/cyanogenmod/explorer/model/AID.java b/src/com/cyanogenmod/filemanager/model/AID.java
index 65c19b4f..c6f288ba 100644
--- a/src/com/cyanogenmod/explorer/model/AID.java
+++ b/src/com/cyanogenmod/filemanager/model/AID.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.model;
+package com.cyanogenmod.filemanager.model;
 
 import java.io.Serializable;
 
diff --git a/src/com/cyanogenmod/explorer/model/BlockDevice.java b/src/com/cyanogenmod/filemanager/model/BlockDevice.java
index 5d5b3040..5fa56531 100644
--- a/src/com/cyanogenmod/explorer/model/BlockDevice.java
+++ b/src/com/cyanogenmod/filemanager/model/BlockDevice.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.model;
+package com.cyanogenmod.filemanager.model;
 
 import java.util.Date;
 
diff --git a/src/com/cyanogenmod/explorer/model/Bookmark.java b/src/com/cyanogenmod/filemanager/model/Bookmark.java
index 8e216a9a..192f2d9c 100644
--- a/src/com/cyanogenmod/explorer/model/Bookmark.java
+++ b/src/com/cyanogenmod/filemanager/model/Bookmark.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.model;
+package com.cyanogenmod.filemanager.model;
 
 import android.database.Cursor;
 import android.net.Uri;
@@ -22,7 +22,7 @@ import android.os.Parcel;
 import android.os.Parcelable;
 import android.provider.BaseColumns;
 
-import com.cyanogenmod.explorer.providers.BookmarksContentProvider;
+import com.cyanogenmod.filemanager.providers.BookmarksContentProvider;
 
 import java.io.File;
 import java.io.Serializable;
diff --git a/src/com/cyanogenmod/explorer/model/CharacterDevice.java b/src/com/cyanogenmod/filemanager/model/CharacterDevice.java
index 8e12ea35..77c35c7e 100644
--- a/src/com/cyanogenmod/explorer/model/CharacterDevice.java
+++ b/src/com/cyanogenmod/filemanager/model/CharacterDevice.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.model;
+package com.cyanogenmod.filemanager.model;
 
 import java.util.Date;
 
diff --git a/src/com/cyanogenmod/explorer/model/Directory.java b/src/com/cyanogenmod/filemanager/model/Directory.java
index 27cc7eb4..ff1bc8d9 100644
--- a/src/com/cyanogenmod/explorer/model/Directory.java
+++ b/src/com/cyanogenmod/filemanager/model/Directory.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.model;
+package com.cyanogenmod.filemanager.model;
 
-import com.cyanogenmod.explorer.R;
+import com.cyanogenmod.filemanager.R;
 
 import java.util.Date;
 
diff --git a/src/com/cyanogenmod/explorer/model/DiskUsage.java b/src/com/cyanogenmod/filemanager/model/DiskUsage.java
index 5febd4e9..693e39b0 100644
--- a/src/com/cyanogenmod/explorer/model/DiskUsage.java
+++ b/src/com/cyanogenmod/filemanager/model/DiskUsage.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.model;
+package com.cyanogenmod.filemanager.model;
 
 import java.io.Serializable;
 
diff --git a/src/com/cyanogenmod/explorer/model/DomainSocket.java b/src/com/cyanogenmod/filemanager/model/DomainSocket.java
index fcc2ecdb..ca0f54d6 100644
--- a/src/com/cyanogenmod/explorer/model/DomainSocket.java
+++ b/src/com/cyanogenmod/filemanager/model/DomainSocket.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.model;
+package com.cyanogenmod.filemanager.model;
 
 import java.util.Date;
 
diff --git a/src/com/cyanogenmod/explorer/model/FileSystemObject.java b/src/com/cyanogenmod/filemanager/model/FileSystemObject.java
index 95a451db..4b7aab7d 100644
--- a/src/com/cyanogenmod/explorer/model/FileSystemObject.java
+++ b/src/com/cyanogenmod/filemanager/model/FileSystemObject.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.model;
+package com.cyanogenmod.filemanager.model;
 
-import com.cyanogenmod.explorer.R;
-import com.cyanogenmod.explorer.util.FileHelper;
+import com.cyanogenmod.filemanager.R;
+import com.cyanogenmod.filemanager.util.FileHelper;
 
 import java.io.File;
 import java.io.Serializable;
diff --git a/src/com/cyanogenmod/explorer/model/FolderUsage.java b/src/com/cyanogenmod/filemanager/model/FolderUsage.java
index 72da5726..341f72a1 100644
--- a/src/com/cyanogenmod/explorer/model/FolderUsage.java
+++ b/src/com/cyanogenmod/filemanager/model/FolderUsage.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.model;
+package com.cyanogenmod.filemanager.model;
 
 import android.util.SparseArray;
 
-import com.cyanogenmod.explorer.util.MimeTypeHelper.MimeTypeCategory;
+import com.cyanogenmod.filemanager.util.MimeTypeHelper.MimeTypeCategory;
 
 import java.io.Serializable;
 
diff --git a/src/com/cyanogenmod/explorer/model/Group.java b/src/com/cyanogenmod/filemanager/model/Group.java
index 3d1eef62..553bd998 100644
--- a/src/com/cyanogenmod/explorer/model/Group.java
+++ b/src/com/cyanogenmod/filemanager/model/Group.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.model;
+package com.cyanogenmod.filemanager.model;
 
 /**
  * A class that represents a group of the operating system.
diff --git a/src/com/cyanogenmod/explorer/model/GroupPermission.java b/src/com/cyanogenmod/filemanager/model/GroupPermission.java
index a90c4226..3a32c586 100644
--- a/src/com/cyanogenmod/explorer/model/GroupPermission.java
+++ b/src/com/cyanogenmod/filemanager/model/GroupPermission.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.model;
+package com.cyanogenmod.filemanager.model;
 
 /**
  * A class for represents a group permissions.
diff --git a/src/com/cyanogenmod/explorer/model/History.java b/src/com/cyanogenmod/filemanager/model/History.java
index 81dd1fbe..32787836 100644
--- a/src/com/cyanogenmod/explorer/model/History.java
+++ b/src/com/cyanogenmod/filemanager/model/History.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.model;
+package com.cyanogenmod.filemanager.model;
 
-import com.cyanogenmod.explorer.parcelables.HistoryNavigable;
+import com.cyanogenmod.filemanager.parcelables.HistoryNavigable;
 
 import java.io.Serializable;
 
diff --git a/src/com/cyanogenmod/explorer/model/Identity.java b/src/com/cyanogenmod/filemanager/model/Identity.java
index 35c31d38..e0aff5b1 100644
--- a/src/com/cyanogenmod/explorer/model/Identity.java
+++ b/src/com/cyanogenmod/filemanager/model/Identity.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.model;
+package com.cyanogenmod.filemanager.model;
 
 import java.io.Serializable;
 import java.util.ArrayList;
diff --git a/src/com/cyanogenmod/explorer/model/MountPoint.java b/src/com/cyanogenmod/filemanager/model/MountPoint.java
index 29424fcd..92576a87 100644
--- a/src/com/cyanogenmod/explorer/model/MountPoint.java
+++ b/src/com/cyanogenmod/filemanager/model/MountPoint.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.model;
+package com.cyanogenmod.filemanager.model;
 
 import java.io.Serializable;
 
diff --git a/src/com/cyanogenmod/explorer/model/NamedPipe.java b/src/com/cyanogenmod/filemanager/model/NamedPipe.java
index 95f85f16..7899f9fa 100644
--- a/src/com/cyanogenmod/explorer/model/NamedPipe.java
+++ b/src/com/cyanogenmod/filemanager/model/NamedPipe.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.model;
+package com.cyanogenmod.filemanager.model;
 
 import java.util.Date;
 
diff --git a/src/com/cyanogenmod/explorer/model/OthersPermission.java b/src/com/cyanogenmod/filemanager/model/OthersPermission.java
index 407b4d45..09c5b62e 100644
--- a/src/com/cyanogenmod/explorer/model/OthersPermission.java
+++ b/src/com/cyanogenmod/filemanager/model/OthersPermission.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.model;
+package com.cyanogenmod.filemanager.model;
 
 /**
  * A class for represents a others permissions.
diff --git a/src/com/cyanogenmod/explorer/model/ParentDirectory.java b/src/com/cyanogenmod/filemanager/model/ParentDirectory.java
index cd13e69d..f2a905b1 100644
--- a/src/com/cyanogenmod/explorer/model/ParentDirectory.java
+++ b/src/com/cyanogenmod/filemanager/model/ParentDirectory.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.model;
+package com.cyanogenmod.filemanager.model;
 
-import com.cyanogenmod.explorer.util.FileHelper;
+import com.cyanogenmod.filemanager.util.FileHelper;
 
 
 /**
diff --git a/src/com/cyanogenmod/explorer/model/Permission.java b/src/com/cyanogenmod/filemanager/model/Permission.java
index 309af11e..61cd7b55 100644
--- a/src/com/cyanogenmod/explorer/model/Permission.java
+++ b/src/com/cyanogenmod/filemanager/model/Permission.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.model;
+package com.cyanogenmod.filemanager.model;
 
 import java.io.Serializable;
 
diff --git a/src/com/cyanogenmod/explorer/model/Permissions.java b/src/com/cyanogenmod/filemanager/model/Permissions.java
index 3d285398..cad6a054 100644
--- a/src/com/cyanogenmod/explorer/model/Permissions.java
+++ b/src/com/cyanogenmod/filemanager/model/Permissions.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.model;
+package com.cyanogenmod.filemanager.model;
 
-import com.cyanogenmod.explorer.util.ParseHelper;
+import com.cyanogenmod.filemanager.util.ParseHelper;
 
 import java.io.Serializable;
 import java.text.ParseException;
diff --git a/src/com/cyanogenmod/explorer/model/Query.java b/src/com/cyanogenmod/filemanager/model/Query.java
index 7a2f7d73..abda1327 100644
--- a/src/com/cyanogenmod/explorer/model/Query.java
+++ b/src/com/cyanogenmod/filemanager/model/Query.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.model;
+package com.cyanogenmod.filemanager.model;
 
 import android.text.TextUtils;
 
diff --git a/src/com/cyanogenmod/explorer/model/RegularFile.java b/src/com/cyanogenmod/filemanager/model/RegularFile.java
index 1e241cd6..7a3200e8 100644
--- a/src/com/cyanogenmod/explorer/model/RegularFile.java
+++ b/src/com/cyanogenmod/filemanager/model/RegularFile.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.model;
+package com.cyanogenmod.filemanager.model;
 
 import java.util.Date;
 
diff --git a/src/com/cyanogenmod/explorer/model/SearchResult.java b/src/com/cyanogenmod/filemanager/model/SearchResult.java
index e2aa9f8c..6f1c7d0a 100644
--- a/src/com/cyanogenmod/explorer/model/SearchResult.java
+++ b/src/com/cyanogenmod/filemanager/model/SearchResult.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.model;
+package com.cyanogenmod.filemanager.model;
 
 import java.io.Serializable;
 
diff --git a/src/com/cyanogenmod/explorer/model/Symlink.java b/src/com/cyanogenmod/filemanager/model/Symlink.java
index be6ca361..b62e32fa 100644
--- a/src/com/cyanogenmod/explorer/model/Symlink.java
+++ b/src/com/cyanogenmod/filemanager/model/Symlink.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.model;
+package com.cyanogenmod.filemanager.model;
 
 import java.util.Date;
 
diff --git a/src/com/cyanogenmod/explorer/model/SystemFile.java b/src/com/cyanogenmod/filemanager/model/SystemFile.java
index 0aa487cb..637fd536 100644
--- a/src/com/cyanogenmod/explorer/model/SystemFile.java
+++ b/src/com/cyanogenmod/filemanager/model/SystemFile.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.model;
+package com.cyanogenmod.filemanager.model;
 
 import java.util.Date;
 
diff --git a/src/com/cyanogenmod/explorer/model/User.java b/src/com/cyanogenmod/filemanager/model/User.java
index a8cbc9c5..963bf27f 100644
--- a/src/com/cyanogenmod/explorer/model/User.java
+++ b/src/com/cyanogenmod/filemanager/model/User.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.model;
+package com.cyanogenmod.filemanager.model;
 
 /**
  * A class that represents a user of the operating system.
diff --git a/src/com/cyanogenmod/explorer/model/UserPermission.java b/src/com/cyanogenmod/filemanager/model/UserPermission.java
index 996422b2..ced812c9 100644
--- a/src/com/cyanogenmod/explorer/model/UserPermission.java
+++ b/src/com/cyanogenmod/filemanager/model/UserPermission.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.model;
+package com.cyanogenmod.filemanager.model;
 
 /**
  * A class for represents a user permissions.
diff --git a/src/com/cyanogenmod/explorer/parcelables/HistoryNavigable.java b/src/com/cyanogenmod/filemanager/parcelables/HistoryNavigable.java
index 61a0c762..475e30d2 100644
--- a/src/com/cyanogenmod/explorer/parcelables/HistoryNavigable.java
+++ b/src/com/cyanogenmod/filemanager/parcelables/HistoryNavigable.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.parcelables;
+package com.cyanogenmod.filemanager.parcelables;
 
 import android.os.Parcelable;
 
diff --git a/src/com/cyanogenmod/explorer/parcelables/NavigationInfoParcelable.java b/src/com/cyanogenmod/filemanager/parcelables/NavigationInfoParcelable.java
index 46bffff9..af6ecd8f 100644
--- a/src/com/cyanogenmod/explorer/parcelables/NavigationInfoParcelable.java
+++ b/src/com/cyanogenmod/filemanager/parcelables/NavigationInfoParcelable.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.parcelables;
+package com.cyanogenmod.filemanager.parcelables;
 
 import android.os.Parcel;
 import android.os.Parcelable;
 
-import com.cyanogenmod.explorer.model.History;
+import com.cyanogenmod.filemanager.model.History;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/cyanogenmod/explorer/parcelables/NavigationViewInfoParcelable.java b/src/com/cyanogenmod/filemanager/parcelables/NavigationViewInfoParcelable.java
index 1e7bd189..21b72183 100644
--- a/src/com/cyanogenmod/explorer/parcelables/NavigationViewInfoParcelable.java
+++ b/src/com/cyanogenmod/filemanager/parcelables/NavigationViewInfoParcelable.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.parcelables;
+package com.cyanogenmod.filemanager.parcelables;
 
 import android.os.Parcel;
 import android.os.Parcelable;
 
-import com.cyanogenmod.explorer.ExplorerApplication;
-import com.cyanogenmod.explorer.R;
-import com.cyanogenmod.explorer.model.FileSystemObject;
-import com.cyanogenmod.explorer.util.FileHelper;
+import com.cyanogenmod.filemanager.FileManagerApplication;
+import com.cyanogenmod.filemanager.R;
+import com.cyanogenmod.filemanager.model.FileSystemObject;
+import com.cyanogenmod.filemanager.util.FileHelper;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -63,7 +63,7 @@ public class NavigationViewInfoParcelable extends HistoryNavigable {
     @Override
     public String getTitle() {
         if (this.mCurrentDir.compareTo(FileHelper.ROOT_DIRECTORY) == 0) {
-            ExplorerApplication.getInstance().getResources().getString(
+            FileManagerApplication.getInstance().getResources().getString(
                     R.string.root_directory_name);
         }
         return new File(this.mCurrentDir).getName();
diff --git a/src/com/cyanogenmod/explorer/parcelables/SearchInfoParcelable.java b/src/com/cyanogenmod/filemanager/parcelables/SearchInfoParcelable.java
index d2af179c..f9e264ba 100644
--- a/src/com/cyanogenmod/explorer/parcelables/SearchInfoParcelable.java
+++ b/src/com/cyanogenmod/filemanager/parcelables/SearchInfoParcelable.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.parcelables;
+package com.cyanogenmod.filemanager.parcelables;
 
 import android.os.Parcel;
 import android.os.Parcelable;
 
-import com.cyanogenmod.explorer.ExplorerApplication;
-import com.cyanogenmod.explorer.R;
-import com.cyanogenmod.explorer.model.Query;
-import com.cyanogenmod.explorer.model.SearchResult;
+import com.cyanogenmod.filemanager.FileManagerApplication;
+import com.cyanogenmod.filemanager.R;
+import com.cyanogenmod.filemanager.model.Query;
+import com.cyanogenmod.filemanager.model.SearchResult;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -60,7 +60,7 @@ public class SearchInfoParcelable extends HistoryNavigable {
      */
     @Override
     public String getTitle() {
-        return ExplorerApplication.getInstance().
+        return FileManagerApplication.getInstance().
                     getResources().
                         getString(
                             R.string.search_result_name,
diff --git a/src/com/cyanogenmod/explorer/preferences/Bookmarks.java b/src/com/cyanogenmod/filemanager/preferences/Bookmarks.java
index a493e216..74573754 100644
--- a/src/com/cyanogenmod/explorer/preferences/Bookmarks.java
+++ b/src/com/cyanogenmod/filemanager/preferences/Bookmarks.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.preferences;
+package com.cyanogenmod.filemanager.preferences;
 
 import android.content.ContentResolver;
 import android.content.ContentUris;
@@ -23,7 +23,7 @@ import android.content.Context;
 import android.database.Cursor;
 import android.net.Uri;
 
-import com.cyanogenmod.explorer.model.Bookmark;
+import com.cyanogenmod.filemanager.model.Bookmark;
 
 /**
  * A class for deal with user-defined bookmarks
diff --git a/src/com/cyanogenmod/explorer/preferences/BookmarksDatabaseHelper.java b/src/com/cyanogenmod/filemanager/preferences/BookmarksDatabaseHelper.java
index 84107c0d..f5b3e465 100644
--- a/src/com/cyanogenmod/explorer/preferences/BookmarksDatabaseHelper.java
+++ b/src/com/cyanogenmod/filemanager/preferences/BookmarksDatabaseHelper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.preferences;
+package com.cyanogenmod.filemanager.preferences;
 
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
diff --git a/src/com/cyanogenmod/explorer/preferences/CompressionMode.java b/src/com/cyanogenmod/filemanager/preferences/CompressionMode.java
index a68ece1c..1349bbc3 100644
--- a/src/com/cyanogenmod/explorer/preferences/CompressionMode.java
+++ b/src/com/cyanogenmod/filemanager/preferences/CompressionMode.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.preferences;
+package com.cyanogenmod.filemanager.preferences;
 
 /**
  * An enumeration of all implemented compression modes.
diff --git a/src/com/cyanogenmod/explorer/preferences/ConfigurationListener.java b/src/com/cyanogenmod/filemanager/preferences/ConfigurationListener.java
index d65e8029..a2e22089 100644
--- a/src/com/cyanogenmod/explorer/preferences/ConfigurationListener.java
+++ b/src/com/cyanogenmod/filemanager/preferences/ConfigurationListener.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.preferences;
+package com.cyanogenmod.filemanager.preferences;
 
 /**
  * An interface that defines method to observe configuration changes.
@@ -28,5 +28,5 @@ public interface ConfigurationListener {
      * @param newValue The new value of the preference
      * @param applied If the configuration was applied (not need to be applied again)
      */
-    void onConfigurationChanged(ExplorerSettings pref, Object newValue, boolean applied);
+    void onConfigurationChanged(FileManagerSettings pref, Object newValue, boolean applied);
 }
diff --git a/src/com/cyanogenmod/explorer/preferences/DefaultLongClickAction.java b/src/com/cyanogenmod/filemanager/preferences/DefaultLongClickAction.java
index eae338ff..214ce7d2 100644
--- a/src/com/cyanogenmod/explorer/preferences/DefaultLongClickAction.java
+++ b/src/com/cyanogenmod/filemanager/preferences/DefaultLongClickAction.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.preferences;
+package com.cyanogenmod.filemanager.preferences;
 
 /**
  * An enumeration of the long-click action possibilities.
diff --git a/src/com/cyanogenmod/explorer/preferences/ExplorerSettings.java b/src/com/cyanogenmod/filemanager/preferences/FileManagerSettings.java
index 44e0bdb9..96bd645d 100644
--- a/src/com/cyanogenmod/explorer/preferences/ExplorerSettings.java
+++ b/src/com/cyanogenmod/filemanager/preferences/FileManagerSettings.java
@@ -14,126 +14,126 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.preferences;
+package com.cyanogenmod.filemanager.preferences;
 
-import com.cyanogenmod.explorer.util.FileHelper;
+import com.cyanogenmod.filemanager.util.FileHelper;
 
 
 /**
- * The enumeration of settings of Explorer application.
+ * The enumeration of settings of FileManager application.
  */
-public enum ExplorerSettings {
+public enum FileManagerSettings {
     /**
      * Whether is the first use of the application
      * @hide
      */
-    SETTINGS_FIRST_USE("cm_explorer_first_use", Boolean.TRUE),  //$NON-NLS-1$
+    SETTINGS_FIRST_USE("cm_filemanager_first_use", Boolean.TRUE),  //$NON-NLS-1$
 
     /**
      * Whether use SUPERUSER mode.
      * @hide
      */
-    SETTINGS_SUPERUSER_MODE("cm_explorer_superuser_mode", Boolean.FALSE),  //$NON-NLS-1$
+    SETTINGS_SUPERUSER_MODE("cm_filemanager_superuser_mode", Boolean.FALSE),  //$NON-NLS-1$
     /**
      * The initial directory to be used.
      * @hide
      */
-    SETTINGS_INITIAL_DIR("cm_explorer_initial_dir", FileHelper.ROOT_DIRECTORY), //$NON-NLS-1$
+    SETTINGS_INITIAL_DIR("cm_filemanager_initial_dir", FileHelper.ROOT_DIRECTORY), //$NON-NLS-1$
 
     /**
      * The view mode to use (simple, details, or icons).
      * @hide
      */
-    SETTINGS_LAYOUT_MODE("cm_explorer_layout_mode", NavigationLayoutMode.DETAILS), //$NON-NLS-1$
+    SETTINGS_LAYOUT_MODE("cm_filemanager_layout_mode", NavigationLayoutMode.DETAILS), //$NON-NLS-1$
     /**
      * The sort mode to use (name or data, ascending or descending).
      * @hide
      */
-    SETTINGS_SORT_MODE("cm_explorer_sort_mode", NavigationSortMode.NAME_ASC), //$NON-NLS-1$
+    SETTINGS_SORT_MODE("cm_filemanager_sort_mode", NavigationSortMode.NAME_ASC), //$NON-NLS-1$
 
     /**
      * When to sort the directories before the files.
      * @hide
      */
-    SETTINGS_SHOW_DIRS_FIRST("cm_explorer_show_dirs_first", Boolean.TRUE), //$NON-NLS-1$
+    SETTINGS_SHOW_DIRS_FIRST("cm_filemanager_show_dirs_first", Boolean.TRUE), //$NON-NLS-1$
     /**
      * When to show the hidden files.
      * @hide
      */
-    SETTINGS_SHOW_HIDDEN("cm_explorer_show_hidden", Boolean.FALSE), //$NON-NLS-1$
+    SETTINGS_SHOW_HIDDEN("cm_filemanager_show_hidden", Boolean.FALSE), //$NON-NLS-1$
     /**
      * When to show the system files.
      * @hide
      */
-    SETTINGS_SHOW_SYSTEM("cm_explorer_show_system", Boolean.FALSE), //$NON-NLS-1$
+    SETTINGS_SHOW_SYSTEM("cm_filemanager_show_system", Boolean.FALSE), //$NON-NLS-1$
     /**
      * When to show the symlinks files.
      * @hide
      */
-    SETTINGS_SHOW_SYMLINKS("cm_explorer_show_symlinks", Boolean.FALSE), //$NON-NLS-1$
+    SETTINGS_SHOW_SYMLINKS("cm_filemanager_show_symlinks", Boolean.FALSE), //$NON-NLS-1$
 
     /**
      * When to use case sensitive comparison in sorting of files
      * @hide
      */
-    SETTINGS_CASE_SENSITIVE_SORT("cm_explorer_case_sensitive_sort", Boolean.FALSE), //$NON-NLS-1$
+    SETTINGS_CASE_SENSITIVE_SORT("cm_filemanager_case_sensitive_sort", Boolean.FALSE), //$NON-NLS-1$
     /**
      * Default action when long-click over a FileSystemObject item
      * @hide
      */
     SETTINGS_DEFAULT_LONG_CLICK_ACTION(
-            "cm_explorer_default_longclick_action", //$NON-NLS-1$
+            "cm_filemanager_default_longclick_action", //$NON-NLS-1$
             DefaultLongClickAction.NONE),
     /**
      * When display a warning in free disk widget
      * @hide
      */
     SETTINGS_DISK_USAGE_WARNING_LEVEL(
-            "cm_explorer_disk_usage_warning_level", //$NON-NLS-1$
+            "cm_filemanager_disk_usage_warning_level", //$NON-NLS-1$
             new String("95")), //$NON-NLS-1$
     /**
      * When to compute folder statistics in folder properties dialog
      * @hide
      */
     SETTINGS_COMPUTE_FOLDER_STATISTICS(
-            "cm_explorer_compute_folder_statistics", Boolean.FALSE), //$NON-NLS-1$
+            "cm_filemanager_compute_folder_statistics", Boolean.FALSE), //$NON-NLS-1$
     /**
      * When to run in advanced mode
      * @hide
      */
     SETTINGS_ADVANCE_MODE(
-            "cm_explorer_advanced_mode", Boolean.FALSE), //$NON-NLS-1$
+            "cm_filemanager_advanced_mode", Boolean.FALSE), //$NON-NLS-1$
 
     /**
      * When to highlight the terms of the search in the search results
      * @hide
      */
-    SETTINGS_HIGHLIGHT_TERMS("cm_explorer_highlight_terms", Boolean.TRUE), //$NON-NLS-1$
+    SETTINGS_HIGHLIGHT_TERMS("cm_filemanager_highlight_terms", Boolean.TRUE), //$NON-NLS-1$
     /**
      * When to show the relevance widget on searches
      * @hide
      */
     SETTINGS_SHOW_RELEVANCE_WIDGET(
-            "cm_explorer_show_relevance_widget", //$NON-NLS-1$
+            "cm_filemanager_show_relevance_widget", //$NON-NLS-1$
             Boolean.TRUE),
     /**
      * How to sort the search results
      * @hide
      */
     SETTINGS_SORT_SEARCH_RESULTS_MODE(
-            "cm_explorer_sort_search_results_mode", //$NON-NLS-1$
+            "cm_filemanager_sort_search_results_mode", //$NON-NLS-1$
             SearchSortResultMode.RELEVANCE),
     /**
      * When to save the search terms
      * @hide
      */
-    SETTINGS_SAVE_SEARCH_TERMS("cm_explorer_save_search_terms", Boolean.TRUE), //$NON-NLS-1$
+    SETTINGS_SAVE_SEARCH_TERMS("cm_filemanager_save_search_terms", Boolean.TRUE), //$NON-NLS-1$
 
     /**
      * When to show debug traces
      * @hide
      */
-    SETTINGS_SHOW_TRACES("cm_explorer_show_debug_traces", Boolean.FALSE); //$NON-NLS-1$
+    SETTINGS_SHOW_TRACES("cm_filemanager_show_debug_traces", Boolean.FALSE); //$NON-NLS-1$
 
 
 
@@ -141,13 +141,13 @@ public enum ExplorerSettings {
      * A broadcast intent that is sent when a setting was changed
      */
     public final static String INTENT_SETTING_CHANGED =
-                        "com.cyanogenmod.explorer.INTENT_SETTING_CHANGED"; //$NON-NLS-1$
+                        "com.cyanogenmod.filemanager.INTENT_SETTING_CHANGED"; //$NON-NLS-1$
 
     /**
      * A broadcast intent that is sent when a file was changed
      */
     public final static String INTENT_FILE_CHANGED =
-                        "com.cyanogenmod.explorer.INTENT_FILE_CHANGED"; //$NON-NLS-1$
+                        "com.cyanogenmod.filemanager.INTENT_FILE_CHANGED"; //$NON-NLS-1$
 
     /**
      * The extra key with the preference key that was changed
@@ -166,12 +166,12 @@ public enum ExplorerSettings {
     private final Object mDefaultValue;
 
     /**
-     * Constructor of <code>ExplorerSettings</code>.
+     * Constructor of <code>FileManagerSettings</code>.
      *
      * @param id The unique identifier of the setting
      * @param defaultValue The default value of the setting
      */
-    private ExplorerSettings(String id, Object defaultValue) {
+    private FileManagerSettings(String id, Object defaultValue) {
         this.mId = id;
         this.mDefaultValue = defaultValue;
     }
@@ -194,14 +194,14 @@ public enum ExplorerSettings {
     }
 
     /**
-     * Method that returns an instance of {@link ExplorerSettings} from its.
+     * Method that returns an instance of {@link FileManagerSettings} from its.
      * unique identifier
      *
      * @param id The unique identifier
-     * @return ExplorerSettings The navigation sort mode
+     * @return FileManagerSettings The navigation sort mode
      */
-    public static ExplorerSettings fromId(String id) {
-        ExplorerSettings[] values = values();
+    public static FileManagerSettings fromId(String id) {
+        FileManagerSettings[] values = values();
         int cc = values.length;
         for (int i = 0; i < cc; i++) {
             if (values[i].mId == id) {
diff --git a/src/com/cyanogenmod/explorer/preferences/NavigationLayoutMode.java b/src/com/cyanogenmod/filemanager/preferences/NavigationLayoutMode.java
index 4787259b..eb572db7 100644
--- a/src/com/cyanogenmod/explorer/preferences/NavigationLayoutMode.java
+++ b/src/com/cyanogenmod/filemanager/preferences/NavigationLayoutMode.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.preferences;
+package com.cyanogenmod.filemanager.preferences;
 
 /**
  * An enumeration of the view layout modes.
diff --git a/src/com/cyanogenmod/explorer/preferences/NavigationSortMode.java b/src/com/cyanogenmod/filemanager/preferences/NavigationSortMode.java
index 952e4a8c..41e97791 100644
--- a/src/com/cyanogenmod/explorer/preferences/NavigationSortMode.java
+++ b/src/com/cyanogenmod/filemanager/preferences/NavigationSortMode.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.preferences;
+package com.cyanogenmod.filemanager.preferences;
 
 /**
  * An enumeration of the navigation sort modes.
diff --git a/src/com/cyanogenmod/explorer/preferences/ObjectIdentifier.java b/src/com/cyanogenmod/filemanager/preferences/ObjectIdentifier.java
index 0819a573..c903e122 100644
--- a/src/com/cyanogenmod/explorer/preferences/ObjectIdentifier.java
+++ b/src/com/cyanogenmod/filemanager/preferences/ObjectIdentifier.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.preferences;
+package com.cyanogenmod.filemanager.preferences;
 
 /**
  * An interface that defines an object with an identifier.
diff --git a/src/com/cyanogenmod/explorer/preferences/ObjectStringIdentifier.java b/src/com/cyanogenmod/filemanager/preferences/ObjectStringIdentifier.java
index 87d45d00..e24fb406 100644
--- a/src/com/cyanogenmod/explorer/preferences/ObjectStringIdentifier.java
+++ b/src/com/cyanogenmod/filemanager/preferences/ObjectStringIdentifier.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.preferences;
+package com.cyanogenmod.filemanager.preferences;
 
 /**
  * An interface that defines an object with an identifier.
diff --git a/src/com/cyanogenmod/explorer/preferences/Preferences.java b/src/com/cyanogenmod/filemanager/preferences/Preferences.java
index c1a76a29..bbd218ae 100644
--- a/src/com/cyanogenmod/explorer/preferences/Preferences.java
+++ b/src/com/cyanogenmod/filemanager/preferences/Preferences.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.preferences;
+package com.cyanogenmod.filemanager.preferences;
 
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.util.Log;
 
-import com.cyanogenmod.explorer.ExplorerApplication;
+import com.cyanogenmod.filemanager.FileManagerApplication;
 
 import java.io.InvalidClassException;
 import java.util.ArrayList;
@@ -44,10 +44,10 @@ public final class Preferences {
     private static String sLastSearch = ""; //$NON-NLS-1$
 
     /**
-     * The name of the explorer settings file.
+     * The name of the file manager settings file.
      * @hide
      */
-    public static final String SETTINGS_FILENAME = "com.cyanogenmod.explorer"; //$NON-NLS-1$
+    public static final String SETTINGS_FILENAME = "com.cyanogenmod.filemanager"; //$NON-NLS-1$
 
     /**
      * The list of configuration listeners.
@@ -87,9 +87,9 @@ public final class Preferences {
     public static void loadDefaults() {
         //Sets the default preferences if no value is set yet
         try {
-            Map<ExplorerSettings, Object> defaultPrefs =
-                    new HashMap<ExplorerSettings, Object>();
-            ExplorerSettings[] values = ExplorerSettings.values();
+            Map<FileManagerSettings, Object> defaultPrefs =
+                    new HashMap<FileManagerSettings, Object>();
+            FileManagerSettings[] values = FileManagerSettings.values();
             int cc = values.length;
             for (int i = 0; i < cc; i++) {
                 defaultPrefs.put(values[i], values[i].getDefaultValue());
@@ -125,7 +125,7 @@ public final class Preferences {
      * @hide
      */
     public static SharedPreferences getSharedPreferences() {
-        return ExplorerApplication.getInstance().getSharedPreferences(
+        return FileManagerApplication.getInstance().getSharedPreferences(
                 SETTINGS_FILENAME, Context.MODE_PRIVATE);
     }
 
@@ -138,10 +138,10 @@ public final class Preferences {
      * @throws InvalidClassException If the value of the preference is not of the
      * type of the preference
      */
-    public static void savePreference(ExplorerSettings pref, Object value, boolean applied)
+    public static void savePreference(FileManagerSettings pref, Object value, boolean applied)
             throws InvalidClassException {
-        Map<ExplorerSettings, Object> prefs =
-                new HashMap<ExplorerSettings, Object>();
+        Map<FileManagerSettings, Object> prefs =
+                new HashMap<FileManagerSettings, Object>();
         prefs.put(pref, value);
         savePreferences(prefs, applied);
     }
@@ -154,7 +154,7 @@ public final class Preferences {
      * @throws InvalidClassException If the value of a preference is not of the
      * type of the preference
      */
-    public static void savePreferences(Map<ExplorerSettings, Object> prefs, boolean applied)
+    public static void savePreferences(Map<FileManagerSettings, Object> prefs, boolean applied)
             throws InvalidClassException {
         savePreferences(prefs, true, applied);
     }
@@ -169,16 +169,16 @@ public final class Preferences {
      * type of the preference
      */
     private static void savePreferences(
-            Map<ExplorerSettings, Object> prefs, boolean noSaveIfExists, boolean applied)
+            Map<FileManagerSettings, Object> prefs, boolean noSaveIfExists, boolean applied)
             throws InvalidClassException {
         //Get the preferences editor
         SharedPreferences sp = getSharedPreferences();
         Editor editor = sp.edit();
 
         //Save all settings
-        Iterator<ExplorerSettings> it = prefs.keySet().iterator();
+        Iterator<FileManagerSettings> it = prefs.keySet().iterator();
         while (it.hasNext()) {
-            ExplorerSettings pref = it.next();
+            FileManagerSettings pref = it.next();
             if (!noSaveIfExists && sp.contains(pref.getId())) {
                 //The preference already has a value
                 continue;
@@ -217,7 +217,7 @@ public final class Preferences {
         if (CONFIGURATION_LISTENERS != null && CONFIGURATION_LISTENERS.size() > 0) {
             it = prefs.keySet().iterator();
             while (it.hasNext()) {
-                ExplorerSettings pref = it.next();
+                FileManagerSettings pref = it.next();
                 Object value = prefs.get(pref);
                 int cc = CONFIGURATION_LISTENERS.size();
                 for (int i = 0; i < cc; i++) {
diff --git a/src/com/cyanogenmod/explorer/preferences/SearchSortResultMode.java b/src/com/cyanogenmod/filemanager/preferences/SearchSortResultMode.java
index c209f3f6..0bf6b428 100644
--- a/src/com/cyanogenmod/explorer/preferences/SearchSortResultMode.java
+++ b/src/com/cyanogenmod/filemanager/preferences/SearchSortResultMode.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.preferences;
+package com.cyanogenmod.filemanager.preferences;
 
 /**
  * An enumeration of the search result sort modes.
diff --git a/src/com/cyanogenmod/explorer/preferences/UncompressionMode.java b/src/com/cyanogenmod/filemanager/preferences/UncompressionMode.java
index 2d99fab5..94be8c7e 100644
--- a/src/com/cyanogenmod/explorer/preferences/UncompressionMode.java
+++ b/src/com/cyanogenmod/filemanager/preferences/UncompressionMode.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.preferences;
+package com.cyanogenmod.filemanager.preferences;
 
 /**
  * An enumeration of all implemented uncompression modes.
diff --git a/src/com/cyanogenmod/explorer/providers/BookmarksContentProvider.java b/src/com/cyanogenmod/filemanager/providers/BookmarksContentProvider.java
index a4f2522a..254ebde9 100644
--- a/src/com/cyanogenmod/explorer/providers/BookmarksContentProvider.java
+++ b/src/com/cyanogenmod/filemanager/providers/BookmarksContentProvider.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.providers;
+package com.cyanogenmod.filemanager.providers;
 
 import android.content.ContentProvider;
 import android.content.ContentUris;
@@ -28,8 +28,8 @@ import android.net.Uri;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.cyanogenmod.explorer.model.Bookmark;
-import com.cyanogenmod.explorer.preferences.BookmarksDatabaseHelper;
+import com.cyanogenmod.filemanager.model.Bookmark;
+import com.cyanogenmod.filemanager.preferences.BookmarksDatabaseHelper;
 
 /**
  * A content provider for manage the user-defined bookmarks
@@ -49,7 +49,7 @@ public class BookmarksContentProvider extends ContentProvider  {
      * The authority string name.
      */
     public static final String AUTHORITY =
-            "com.cyanogenmod.explorer.providers.bookmarks"; //$NON-NLS-1$
+            "com.cyanogenmod.filemanager.providers.bookmarks"; //$NON-NLS-1$
 
     private static final UriMatcher sURLMatcher = new UriMatcher(UriMatcher.NO_MATCH);
 
diff --git a/src/com/cyanogenmod/explorer/providers/RecentSearchesContentProvider.java b/src/com/cyanogenmod/filemanager/providers/RecentSearchesContentProvider.java
index 39ef5c97..6a3e7d08 100644
--- a/src/com/cyanogenmod/explorer/providers/RecentSearchesContentProvider.java
+++ b/src/com/cyanogenmod/filemanager/providers/RecentSearchesContentProvider.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.providers;
+package com.cyanogenmod.filemanager.providers;
 
 import android.content.SearchRecentSuggestionsProvider;
 
@@ -27,7 +27,7 @@ public class RecentSearchesContentProvider extends SearchRecentSuggestionsProvid
      * The authority string name.
      */
     public static final String AUTHORITY =
-            "com.cyanogenmod.explorer.providers.recentsearches"; //$NON-NLS-1$
+            "com.cyanogenmod.filemanager.providers.recentsearches"; //$NON-NLS-1$
 
     /**
      * The provider mode.
diff --git a/src/com/cyanogenmod/explorer/tasks/FilesystemAsyncTask.java b/src/com/cyanogenmod/filemanager/tasks/FilesystemAsyncTask.java
index 43b50213..81be9035 100644
--- a/src/com/cyanogenmod/explorer/tasks/FilesystemAsyncTask.java
+++ b/src/com/cyanogenmod/filemanager/tasks/FilesystemAsyncTask.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.tasks;
+package com.cyanogenmod.filemanager.tasks;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -25,10 +25,10 @@ import android.util.Log;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
 
-import com.cyanogenmod.explorer.R;
-import com.cyanogenmod.explorer.model.DiskUsage;
-import com.cyanogenmod.explorer.model.MountPoint;
-import com.cyanogenmod.explorer.util.MountPointHelper;
+import com.cyanogenmod.filemanager.R;
+import com.cyanogenmod.filemanager.model.DiskUsage;
+import com.cyanogenmod.filemanager.model.MountPoint;
+import com.cyanogenmod.filemanager.util.MountPointHelper;
 
 /**
  * A class for recovery information about filesystem status (mount point, disk usage, ...).
diff --git a/src/com/cyanogenmod/explorer/tasks/SearchResultDrawingAsyncTask.java b/src/com/cyanogenmod/filemanager/tasks/SearchResultDrawingAsyncTask.java
index e41a85d4..9dd93432 100644
--- a/src/com/cyanogenmod/explorer/tasks/SearchResultDrawingAsyncTask.java
+++ b/src/com/cyanogenmod/filemanager/tasks/SearchResultDrawingAsyncTask.java
@@ -14,29 +14,29 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.tasks;
+package com.cyanogenmod.filemanager.tasks;
 
 import android.os.AsyncTask;
 import android.view.View;
 import android.widget.ListView;
 import android.widget.ProgressBar;
 
-import com.cyanogenmod.explorer.ExplorerApplication;
-import com.cyanogenmod.explorer.R;
-import com.cyanogenmod.explorer.adapters.SearchResultAdapter;
-import com.cyanogenmod.explorer.adapters.SearchResultAdapter.OnRequestMenuListener;
-import com.cyanogenmod.explorer.model.FileSystemObject;
-import com.cyanogenmod.explorer.model.Query;
-import com.cyanogenmod.explorer.model.SearchResult;
-import com.cyanogenmod.explorer.preferences.ExplorerSettings;
-import com.cyanogenmod.explorer.preferences.NavigationSortMode;
-import com.cyanogenmod.explorer.preferences.ObjectStringIdentifier;
-import com.cyanogenmod.explorer.preferences.Preferences;
-import com.cyanogenmod.explorer.preferences.SearchSortResultMode;
-import com.cyanogenmod.explorer.util.ExceptionUtil;
-import com.cyanogenmod.explorer.util.FileHelper;
-import com.cyanogenmod.explorer.util.MimeTypeHelper;
-import com.cyanogenmod.explorer.util.SearchHelper;
+import com.cyanogenmod.filemanager.FileManagerApplication;
+import com.cyanogenmod.filemanager.R;
+import com.cyanogenmod.filemanager.adapters.SearchResultAdapter;
+import com.cyanogenmod.filemanager.adapters.SearchResultAdapter.OnRequestMenuListener;
+import com.cyanogenmod.filemanager.model.FileSystemObject;
+import com.cyanogenmod.filemanager.model.Query;
+import com.cyanogenmod.filemanager.model.SearchResult;
+import com.cyanogenmod.filemanager.preferences.FileManagerSettings;
+import com.cyanogenmod.filemanager.preferences.NavigationSortMode;
+import com.cyanogenmod.filemanager.preferences.ObjectStringIdentifier;
+import com.cyanogenmod.filemanager.preferences.Preferences;
+import com.cyanogenmod.filemanager.preferences.SearchSortResultMode;
+import com.cyanogenmod.filemanager.util.ExceptionUtil;
+import com.cyanogenmod.filemanager.util.FileHelper;
+import com.cyanogenmod.filemanager.util.MimeTypeHelper;
+import com.cyanogenmod.filemanager.util.SearchHelper;
 
 import java.util.Collections;
 import java.util.Comparator;
@@ -108,15 +108,15 @@ public class SearchResultDrawingAsyncTask extends AsyncTask<Object, Integer, Boo
             showHideWaiting(true);
 
             // Get sort mode
-            String defaultValue = ((ObjectStringIdentifier)ExplorerSettings.
+            String defaultValue = ((ObjectStringIdentifier)FileManagerSettings.
                     SETTINGS_SORT_SEARCH_RESULTS_MODE.getDefaultValue()).getId();
             String value = Preferences.getSharedPreferences().getString(
-                                ExplorerSettings.SETTINGS_SORT_SEARCH_RESULTS_MODE.getId(),
+                                FileManagerSettings.SETTINGS_SORT_SEARCH_RESULTS_MODE.getId(),
                                 defaultValue);
             SearchSortResultMode mode = SearchSortResultMode.fromId(value);
 
             // Are we in ChRooted environment?
-            boolean chRooted = !ExplorerApplication.isAdvancedMode();
+            boolean chRooted = !FileManagerApplication.isAdvancedMode();
 
             //Process all the data
             final List<SearchResult> result =
diff --git a/src/com/cyanogenmod/explorer/ui/IconHolder.java b/src/com/cyanogenmod/filemanager/ui/IconHolder.java
index 5c540a95..14f62176 100644
--- a/src/com/cyanogenmod/explorer/ui/IconHolder.java
+++ b/src/com/cyanogenmod/filemanager/ui/IconHolder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.ui;
+package com.cyanogenmod.filemanager.ui;
 
 import android.content.Context;
 import android.content.res.Resources;
diff --git a/src/com/cyanogenmod/explorer/ui/dialogs/ActionsDialog.java b/src/com/cyanogenmod/filemanager/ui/dialogs/ActionsDialog.java
index a84ce4ae..6ce731a7 100644
--- a/src/com/cyanogenmod/explorer/ui/dialogs/ActionsDialog.java
+++ b/src/com/cyanogenmod/filemanager/ui/dialogs/ActionsDialog.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.ui.dialogs;
+package com.cyanogenmod.filemanager.ui.dialogs;
 
 import android.app.AlertDialog;
 import android.content.Context;
@@ -32,29 +32,29 @@ import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.cyanogenmod.explorer.ExplorerApplication;
-import com.cyanogenmod.explorer.R;
-import com.cyanogenmod.explorer.adapters.TwoColumnsMenuListAdapter;
-import com.cyanogenmod.explorer.listeners.OnRequestRefreshListener;
-import com.cyanogenmod.explorer.listeners.OnSelectionListener;
-import com.cyanogenmod.explorer.model.FileSystemObject;
-import com.cyanogenmod.explorer.model.SystemFile;
-import com.cyanogenmod.explorer.ui.policy.BookmarksActionPolicy;
-import com.cyanogenmod.explorer.ui.policy.CompressActionPolicy;
-import com.cyanogenmod.explorer.ui.policy.CopyMoveActionPolicy;
-import com.cyanogenmod.explorer.ui.policy.CopyMoveActionPolicy.LinkedResource;
-import com.cyanogenmod.explorer.ui.policy.DeleteActionPolicy;
-import com.cyanogenmod.explorer.ui.policy.ExecutionActionPolicy;
-import com.cyanogenmod.explorer.ui.policy.InfoActionPolicy;
-import com.cyanogenmod.explorer.ui.policy.IntentsActionPolicy;
-import com.cyanogenmod.explorer.ui.policy.NavigationActionPolicy;
-import com.cyanogenmod.explorer.ui.policy.NewActionPolicy;
-import com.cyanogenmod.explorer.util.DialogHelper;
-import com.cyanogenmod.explorer.util.FileHelper;
-import com.cyanogenmod.explorer.util.MimeTypeHelper;
-import com.cyanogenmod.explorer.util.MimeTypeHelper.MimeTypeCategory;
-import com.cyanogenmod.explorer.util.SelectionHelper;
-import com.cyanogenmod.explorer.util.StorageHelper;
+import com.cyanogenmod.filemanager.FileManagerApplication;
+import com.cyanogenmod.filemanager.R;
+import com.cyanogenmod.filemanager.adapters.TwoColumnsMenuListAdapter;
+import com.cyanogenmod.filemanager.listeners.OnRequestRefreshListener;
+import com.cyanogenmod.filemanager.listeners.OnSelectionListener;
+import com.cyanogenmod.filemanager.model.FileSystemObject;
+import com.cyanogenmod.filemanager.model.SystemFile;
+import com.cyanogenmod.filemanager.ui.policy.BookmarksActionPolicy;
+import com.cyanogenmod.filemanager.ui.policy.CompressActionPolicy;
+import com.cyanogenmod.filemanager.ui.policy.CopyMoveActionPolicy;
+import com.cyanogenmod.filemanager.ui.policy.CopyMoveActionPolicy.LinkedResource;
+import com.cyanogenmod.filemanager.ui.policy.DeleteActionPolicy;
+import com.cyanogenmod.filemanager.ui.policy.ExecutionActionPolicy;
+import com.cyanogenmod.filemanager.ui.policy.InfoActionPolicy;
+import com.cyanogenmod.filemanager.ui.policy.IntentsActionPolicy;
+import com.cyanogenmod.filemanager.ui.policy.NavigationActionPolicy;
+import com.cyanogenmod.filemanager.ui.policy.NewActionPolicy;
+import com.cyanogenmod.filemanager.util.DialogHelper;
+import com.cyanogenmod.filemanager.util.FileHelper;
+import com.cyanogenmod.filemanager.util.MimeTypeHelper;
+import com.cyanogenmod.filemanager.util.MimeTypeHelper.MimeTypeCategory;
+import com.cyanogenmod.filemanager.util.SelectionHelper;
+import com.cyanogenmod.filemanager.util.StorageHelper;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -109,7 +109,7 @@ public class ActionsDialog implements OnItemClickListener, OnItemLongClickListen
         this.mContext = context;
         this.mGlobal = global;
         this.mSearch = search;
-        this.mChRooted = !ExplorerApplication.isAdvancedMode();
+        this.mChRooted = !FileManagerApplication.isAdvancedMode();
 
         //Initialize dialog
         init(context, global ? R.id.mnu_actions_global : R.id.mnu_actions_fso);
diff --git a/src/com/cyanogenmod/explorer/ui/dialogs/AssociationsDialog.java b/src/com/cyanogenmod/filemanager/ui/dialogs/AssociationsDialog.java
index 64b0128f..6143143d 100644
--- a/src/com/cyanogenmod/explorer/ui/dialogs/AssociationsDialog.java
+++ b/src/com/cyanogenmod/filemanager/ui/dialogs/AssociationsDialog.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.ui.dialogs;
+package com.cyanogenmod.filemanager.ui.dialogs;
 
 import android.app.AlertDialog;
 import android.content.ComponentName;
@@ -40,12 +40,12 @@ import android.widget.GridView;
 import android.widget.ListAdapter;
 import android.widget.Toast;
 
-import com.cyanogenmod.explorer.ExplorerApplication;
-import com.cyanogenmod.explorer.R;
-import com.cyanogenmod.explorer.adapters.AssociationsAdapter;
-import com.cyanogenmod.explorer.ui.policy.IntentsActionPolicy;
-import com.cyanogenmod.explorer.util.DialogHelper;
-import com.cyanogenmod.explorer.util.ExceptionUtil;
+import com.cyanogenmod.filemanager.FileManagerApplication;
+import com.cyanogenmod.filemanager.R;
+import com.cyanogenmod.filemanager.adapters.AssociationsAdapter;
+import com.cyanogenmod.filemanager.ui.policy.IntentsActionPolicy;
+import com.cyanogenmod.filemanager.util.DialogHelper;
+import com.cyanogenmod.filemanager.util.ExceptionUtil;
 
 import java.util.Iterator;
 import java.util.List;
@@ -126,7 +126,7 @@ public class AssociationsDialog implements OnItemClickListener {
     private void init(int icon, String title, String action,
             OnCancelListener onCancelListener, OnDismissListener onDismissListener) {
         boolean isPlatformSigned =
-                ExplorerApplication.isAppPlatformSignature(this.mContext);
+                FileManagerApplication.isAppPlatformSignature(this.mContext);
 
         //Create the layout, and retrieve the views
         LayoutInflater li =
@@ -407,12 +407,12 @@ public class AssociationsDialog implements OnItemClickListener {
             }
 
             // Register preferred association is only allowed by platform signature
-            // CMExplorer will be signed with this signature, but when is launch from
+            // The app will be signed with this signature, but when is launch from
             // inside ADT, the app is signed with testkey.
             // Ignore it if the preferred can be saved. Only notify the user and open the
             // intent
             boolean isPlatformSigned =
-                    ExplorerApplication.isAppPlatformSignature(this.mContext);
+                    FileManagerApplication.isAppPlatformSignature(this.mContext);
             if (isPlatformSigned && this.mAllowPreferred) {
                 if (filter != null && !isPreferredSelected() && !isInternalEditor(ri)) {
                     try {
diff --git a/src/com/cyanogenmod/explorer/ui/dialogs/ChooseConsoleDialog.java b/src/com/cyanogenmod/filemanager/ui/dialogs/ChooseConsoleDialog.java
index 573c3ad8..7983e965 100644
--- a/src/com/cyanogenmod/explorer/ui/dialogs/ChooseConsoleDialog.java
+++ b/src/com/cyanogenmod/filemanager/ui/dialogs/ChooseConsoleDialog.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.ui.dialogs;
+package com.cyanogenmod.filemanager.ui.dialogs;
 
 import android.app.AlertDialog;
 import android.content.Context;
@@ -28,15 +28,15 @@ import android.widget.AdapterView.OnItemClickListener;
 import android.widget.LinearLayout;
 import android.widget.ListView;
 
-import com.cyanogenmod.explorer.R;
-import com.cyanogenmod.explorer.adapters.CheckableListAdapter;
-import com.cyanogenmod.explorer.console.Console;
-import com.cyanogenmod.explorer.console.ConsoleBuilder;
-import com.cyanogenmod.explorer.console.shell.NonPriviledgeConsole;
-import com.cyanogenmod.explorer.console.shell.PrivilegedConsole;
-import com.cyanogenmod.explorer.preferences.ExplorerSettings;
-import com.cyanogenmod.explorer.preferences.Preferences;
-import com.cyanogenmod.explorer.util.DialogHelper;
+import com.cyanogenmod.filemanager.R;
+import com.cyanogenmod.filemanager.adapters.CheckableListAdapter;
+import com.cyanogenmod.filemanager.console.Console;
+import com.cyanogenmod.filemanager.console.ConsoleBuilder;
+import com.cyanogenmod.filemanager.console.shell.NonPriviledgeConsole;
+import com.cyanogenmod.filemanager.console.shell.PrivilegedConsole;
+import com.cyanogenmod.filemanager.preferences.FileManagerSettings;
+import com.cyanogenmod.filemanager.preferences.Preferences;
+import com.cyanogenmod.filemanager.util.DialogHelper;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -151,7 +151,7 @@ public class ChooseConsoleDialog implements OnItemClickListener {
         } else {
             try {
                 Preferences.savePreference(
-                        ExplorerSettings.SETTINGS_SUPERUSER_MODE, superuser, true);
+                        FileManagerSettings.SETTINGS_SUPERUSER_MODE, superuser, true);
             } catch (Throwable ex) {
                 Log.w(TAG, "can't save console preference", ex); //$NON-NLS-1$
             }
diff --git a/src/com/cyanogenmod/explorer/ui/dialogs/ExecutionDialog.java b/src/com/cyanogenmod/filemanager/ui/dialogs/ExecutionDialog.java
index d926299e..b1a9cb54 100644
--- a/src/com/cyanogenmod/explorer/ui/dialogs/ExecutionDialog.java
+++ b/src/com/cyanogenmod/filemanager/ui/dialogs/ExecutionDialog.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.ui.dialogs;
+package com.cyanogenmod.filemanager.ui.dialogs;
 
 import android.app.AlertDialog;
 import android.content.Context;
@@ -27,13 +27,13 @@ import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.TextView;
 
-import com.cyanogenmod.explorer.R;
-import com.cyanogenmod.explorer.commands.AsyncResultExecutable;
-import com.cyanogenmod.explorer.commands.ExecExecutable;
-import com.cyanogenmod.explorer.model.FileSystemObject;
-import com.cyanogenmod.explorer.util.DialogHelper;
-import com.cyanogenmod.explorer.util.FixedQueue;
-import com.cyanogenmod.explorer.util.FixedQueue.EmptyQueueException;
+import com.cyanogenmod.filemanager.R;
+import com.cyanogenmod.filemanager.commands.AsyncResultExecutable;
+import com.cyanogenmod.filemanager.commands.ExecExecutable;
+import com.cyanogenmod.filemanager.model.FileSystemObject;
+import com.cyanogenmod.filemanager.util.DialogHelper;
+import com.cyanogenmod.filemanager.util.FixedQueue;
+import com.cyanogenmod.filemanager.util.FixedQueue.EmptyQueueException;
 
 import java.util.List;
 
diff --git a/src/com/cyanogenmod/explorer/ui/dialogs/FilesystemInfoDialog.java b/src/com/cyanogenmod/filemanager/ui/dialogs/FilesystemInfoDialog.java
index 20f45907..f72a05a9 100644
--- a/src/com/cyanogenmod/explorer/ui/dialogs/FilesystemInfoDialog.java
+++ b/src/com/cyanogenmod/filemanager/ui/dialogs/FilesystemInfoDialog.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.ui.dialogs;
+package com.cyanogenmod.filemanager.ui.dialogs;
 
 import android.app.AlertDialog;
 import android.content.Context;
@@ -26,18 +26,18 @@ import android.view.View.OnClickListener;
 import android.widget.Switch;
 import android.widget.TextView;
 
-import com.cyanogenmod.explorer.ExplorerApplication;
-import com.cyanogenmod.explorer.R;
-import com.cyanogenmod.explorer.console.ConsoleBuilder;
-import com.cyanogenmod.explorer.model.DiskUsage;
-import com.cyanogenmod.explorer.model.MountPoint;
-import com.cyanogenmod.explorer.preferences.ExplorerSettings;
-import com.cyanogenmod.explorer.preferences.Preferences;
-import com.cyanogenmod.explorer.ui.widgets.DiskUsageGraph;
-import com.cyanogenmod.explorer.util.CommandHelper;
-import com.cyanogenmod.explorer.util.DialogHelper;
-import com.cyanogenmod.explorer.util.FileHelper;
-import com.cyanogenmod.explorer.util.MountPointHelper;
+import com.cyanogenmod.filemanager.FileManagerApplication;
+import com.cyanogenmod.filemanager.R;
+import com.cyanogenmod.filemanager.console.ConsoleBuilder;
+import com.cyanogenmod.filemanager.model.DiskUsage;
+import com.cyanogenmod.filemanager.model.MountPoint;
+import com.cyanogenmod.filemanager.preferences.FileManagerSettings;
+import com.cyanogenmod.filemanager.preferences.Preferences;
+import com.cyanogenmod.filemanager.ui.widgets.DiskUsageGraph;
+import com.cyanogenmod.filemanager.util.CommandHelper;
+import com.cyanogenmod.filemanager.util.DialogHelper;
+import com.cyanogenmod.filemanager.util.FileHelper;
+import com.cyanogenmod.filemanager.util.MountPointHelper;
 
 /**
  * A class that wraps a dialog for showing information about a mount point.<br />
@@ -103,7 +103,7 @@ public class FilesystemInfoDialog implements OnClickListener {
         this.mMountPoint = mountPoint;
         this.mDiskUsage = diskUsage;
         this.mIsMountAllowed = false;
-        this.mIsAdvancedMode = ExplorerApplication.isAdvancedMode();
+        this.mIsAdvancedMode = FileManagerApplication.isAdvancedMode();
 
         //Inflate the content
         LayoutInflater li =
@@ -159,8 +159,8 @@ public class FilesystemInfoDialog implements OnClickListener {
 
         // Set the user preference about free disk space warning level
         String fds = Preferences.getSharedPreferences().getString(
-                ExplorerSettings.SETTINGS_DISK_USAGE_WARNING_LEVEL.getId(),
-                (String)ExplorerSettings.
+                FileManagerSettings.SETTINGS_DISK_USAGE_WARNING_LEVEL.getId(),
+                (String)FileManagerSettings.
                     SETTINGS_DISK_USAGE_WARNING_LEVEL.getDefaultValue());
         this.mDiskUsageGraph.setFreeDiskSpaceWarningLevel(Integer.parseInt(fds));
 
diff --git a/src/com/cyanogenmod/explorer/ui/dialogs/FsoPropertiesDialog.java b/src/com/cyanogenmod/filemanager/ui/dialogs/FsoPropertiesDialog.java
index 5241293d..085d1310 100644
--- a/src/com/cyanogenmod/explorer/ui/dialogs/FsoPropertiesDialog.java
+++ b/src/com/cyanogenmod/filemanager/ui/dialogs/FsoPropertiesDialog.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.ui.dialogs;
+package com.cyanogenmod.filemanager.ui.dialogs;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -36,32 +36,32 @@ import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.Spinner;
 import android.widget.TextView;
 
-import com.cyanogenmod.explorer.ExplorerApplication;
-import com.cyanogenmod.explorer.R;
-import com.cyanogenmod.explorer.commands.AsyncResultListener;
-import com.cyanogenmod.explorer.commands.FolderUsageExecutable;
-import com.cyanogenmod.explorer.console.ConsoleBuilder;
-import com.cyanogenmod.explorer.model.AID;
-import com.cyanogenmod.explorer.model.FileSystemObject;
-import com.cyanogenmod.explorer.model.FolderUsage;
-import com.cyanogenmod.explorer.model.Group;
-import com.cyanogenmod.explorer.model.GroupPermission;
-import com.cyanogenmod.explorer.model.OthersPermission;
-import com.cyanogenmod.explorer.model.Permission;
-import com.cyanogenmod.explorer.model.Permissions;
-import com.cyanogenmod.explorer.model.Symlink;
-import com.cyanogenmod.explorer.model.User;
-import com.cyanogenmod.explorer.model.UserPermission;
-import com.cyanogenmod.explorer.preferences.ExplorerSettings;
-import com.cyanogenmod.explorer.preferences.Preferences;
-import com.cyanogenmod.explorer.util.AIDHelper;
-import com.cyanogenmod.explorer.util.CommandHelper;
-import com.cyanogenmod.explorer.util.DialogHelper;
-import com.cyanogenmod.explorer.util.ExceptionUtil;
-import com.cyanogenmod.explorer.util.FileHelper;
-import com.cyanogenmod.explorer.util.MimeTypeHelper;
-import com.cyanogenmod.explorer.util.MimeTypeHelper.MimeTypeCategory;
-import com.cyanogenmod.explorer.util.ResourcesHelper;
+import com.cyanogenmod.filemanager.FileManagerApplication;
+import com.cyanogenmod.filemanager.R;
+import com.cyanogenmod.filemanager.commands.AsyncResultListener;
+import com.cyanogenmod.filemanager.commands.FolderUsageExecutable;
+import com.cyanogenmod.filemanager.console.ConsoleBuilder;
+import com.cyanogenmod.filemanager.model.AID;
+import com.cyanogenmod.filemanager.model.FileSystemObject;
+import com.cyanogenmod.filemanager.model.FolderUsage;
+import com.cyanogenmod.filemanager.model.Group;
+import com.cyanogenmod.filemanager.model.GroupPermission;
+import com.cyanogenmod.filemanager.model.OthersPermission;
+import com.cyanogenmod.filemanager.model.Permission;
+import com.cyanogenmod.filemanager.model.Permissions;
+import com.cyanogenmod.filemanager.model.Symlink;
+import com.cyanogenmod.filemanager.model.User;
+import com.cyanogenmod.filemanager.model.UserPermission;
+import com.cyanogenmod.filemanager.preferences.FileManagerSettings;
+import com.cyanogenmod.filemanager.preferences.Preferences;
+import com.cyanogenmod.filemanager.util.AIDHelper;
+import com.cyanogenmod.filemanager.util.CommandHelper;
+import com.cyanogenmod.filemanager.util.DialogHelper;
+import com.cyanogenmod.filemanager.util.ExceptionUtil;
+import com.cyanogenmod.filemanager.util.FileHelper;
+import com.cyanogenmod.filemanager.util.MimeTypeHelper;
+import com.cyanogenmod.filemanager.util.MimeTypeHelper.MimeTypeCategory;
+import com.cyanogenmod.filemanager.util.ResourcesHelper;
 
 import java.text.DateFormat;
 
@@ -152,7 +152,7 @@ public class FsoPropertiesDialog
         this.mHasChanged = false;
         this.mIgnoreCheckEvents = true;
         this.mHasPrivileged = false;
-        this.mIsAdvancedMode = ExplorerApplication.isAdvancedMode();
+        this.mIsAdvancedMode = FileManagerApplication.isAdvancedMode();
 
         //Inflate the content
         LayoutInflater li =
@@ -176,8 +176,8 @@ public class FsoPropertiesDialog
         this.mComputeFolderStatistics =
                 Preferences.getSharedPreferences().
                     getBoolean(
-                        ExplorerSettings.SETTINGS_COMPUTE_FOLDER_STATISTICS.getId(),
-                        ((Boolean)ExplorerSettings.SETTINGS_COMPUTE_FOLDER_STATISTICS.
+                        FileManagerSettings.SETTINGS_COMPUTE_FOLDER_STATISTICS.getId(),
+                        ((Boolean)FileManagerSettings.SETTINGS_COMPUTE_FOLDER_STATISTICS.
                                 getDefaultValue()).booleanValue());
 
         //Fill the dialog
diff --git a/src/com/cyanogenmod/explorer/ui/dialogs/InitialDirectoryDialog.java b/src/com/cyanogenmod/filemanager/ui/dialogs/InitialDirectoryDialog.java
index 54c854ee..9e5e0e2a 100644
--- a/src/com/cyanogenmod/explorer/ui/dialogs/InitialDirectoryDialog.java
+++ b/src/com/cyanogenmod/filemanager/ui/dialogs/InitialDirectoryDialog.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.ui.dialogs;
+package com.cyanogenmod.filemanager.ui.dialogs;
 
 import android.app.AlertDialog;
 import android.content.Context;
@@ -25,11 +25,11 @@ import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.Toast;
 
-import com.cyanogenmod.explorer.R;
-import com.cyanogenmod.explorer.preferences.ExplorerSettings;
-import com.cyanogenmod.explorer.preferences.Preferences;
-import com.cyanogenmod.explorer.ui.widgets.DirectoryInlineAutocompleteTextView;
-import com.cyanogenmod.explorer.util.DialogHelper;
+import com.cyanogenmod.filemanager.R;
+import com.cyanogenmod.filemanager.preferences.FileManagerSettings;
+import com.cyanogenmod.filemanager.preferences.Preferences;
+import com.cyanogenmod.filemanager.ui.widgets.DirectoryInlineAutocompleteTextView;
+import com.cyanogenmod.filemanager.util.DialogHelper;
 
 import java.io.File;
 
@@ -74,8 +74,8 @@ public class InitialDirectoryDialog implements DialogInterface.OnClickListener {
 
         //Extract current value
         String value = Preferences.getSharedPreferences().getString(
-                ExplorerSettings.SETTINGS_INITIAL_DIR.getId(),
-                (String)ExplorerSettings.SETTINGS_INITIAL_DIR.getDefaultValue());
+                FileManagerSettings.SETTINGS_INITIAL_DIR.getId(),
+                (String)FileManagerSettings.SETTINGS_INITIAL_DIR.getDefaultValue());
 
         //Create the layout
         LayoutInflater li =
@@ -170,7 +170,7 @@ public class InitialDirectoryDialog implements DialogInterface.OnClickListener {
                 newInitialDir += File.separator;
             }
             Preferences.savePreference(
-                    ExplorerSettings.SETTINGS_INITIAL_DIR, newInitialDir, true);
+                    FileManagerSettings.SETTINGS_INITIAL_DIR, newInitialDir, true);
             if (this.mOnValueChangedListener != null) {
                 this.mOnValueChangedListener.onValueChanged(newInitialDir);
             }
diff --git a/src/com/cyanogenmod/explorer/ui/dialogs/InputNameDialog.java b/src/com/cyanogenmod/filemanager/ui/dialogs/InputNameDialog.java
index 14e4edf3..8cf9794a 100644
--- a/src/com/cyanogenmod/explorer/ui/dialogs/InputNameDialog.java
+++ b/src/com/cyanogenmod/filemanager/ui/dialogs/InputNameDialog.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.ui.dialogs;
+package com.cyanogenmod.filemanager.ui.dialogs;
 
 import android.app.AlertDialog;
 import android.content.Context;
@@ -27,10 +27,10 @@ import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 import android.widget.TextView;
 
-import com.cyanogenmod.explorer.R;
-import com.cyanogenmod.explorer.model.FileSystemObject;
-import com.cyanogenmod.explorer.util.DialogHelper;
-import com.cyanogenmod.explorer.util.FileHelper;
+import com.cyanogenmod.filemanager.R;
+import com.cyanogenmod.filemanager.model.FileSystemObject;
+import com.cyanogenmod.filemanager.util.DialogHelper;
+import com.cyanogenmod.filemanager.util.FileHelper;
 
 import java.io.File;
 import java.util.List;
diff --git a/src/com/cyanogenmod/explorer/ui/dialogs/MessageProgressDialog.java b/src/com/cyanogenmod/filemanager/ui/dialogs/MessageProgressDialog.java
index c9f247cd..dde157a0 100644
--- a/src/com/cyanogenmod/explorer/ui/dialogs/MessageProgressDialog.java
+++ b/src/com/cyanogenmod/filemanager/ui/dialogs/MessageProgressDialog.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.ui.dialogs;
+package com.cyanogenmod.filemanager.ui.dialogs;
 
 import android.app.AlertDialog;
 import android.content.Context;
@@ -25,8 +25,8 @@ import android.view.ViewGroup;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.cyanogenmod.explorer.R;
-import com.cyanogenmod.explorer.util.DialogHelper;
+import com.cyanogenmod.filemanager.R;
+import com.cyanogenmod.filemanager.util.DialogHelper;
 
 /**
  * A class that wraps a dialog for showing a progress with text message (non graphical).
diff --git a/src/com/cyanogenmod/explorer/ui/policy/ActionsPolicy.java b/src/com/cyanogenmod/filemanager/ui/policy/ActionsPolicy.java
index 3f982bbe..8964c5ef 100644
--- a/src/com/cyanogenmod/explorer/ui/policy/ActionsPolicy.java
+++ b/src/com/cyanogenmod/filemanager/ui/policy/ActionsPolicy.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.ui.policy;
+package com.cyanogenmod.filemanager.ui.policy;
 
 import android.content.Context;
 import android.os.AsyncTask;
 import android.text.Spanned;
 import android.widget.Toast;
 
-import com.cyanogenmod.explorer.R;
-import com.cyanogenmod.explorer.ui.dialogs.MessageProgressDialog;
-import com.cyanogenmod.explorer.util.DialogHelper;
-import com.cyanogenmod.explorer.util.ExceptionUtil;
+import com.cyanogenmod.filemanager.R;
+import com.cyanogenmod.filemanager.ui.dialogs.MessageProgressDialog;
+import com.cyanogenmod.filemanager.util.DialogHelper;
+import com.cyanogenmod.filemanager.util.ExceptionUtil;
 
 
 /**
diff --git a/src/com/cyanogenmod/explorer/ui/policy/BookmarksActionPolicy.java b/src/com/cyanogenmod/filemanager/ui/policy/BookmarksActionPolicy.java
index a9253412..bc1d39f6 100644
--- a/src/com/cyanogenmod/explorer/ui/policy/BookmarksActionPolicy.java
+++ b/src/com/cyanogenmod/filemanager/ui/policy/BookmarksActionPolicy.java
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.ui.policy;
+package com.cyanogenmod.filemanager.ui.policy;
 
 import android.content.Context;
 import android.widget.Toast;
 
-import com.cyanogenmod.explorer.R;
-import com.cyanogenmod.explorer.model.Bookmark;
-import com.cyanogenmod.explorer.model.Bookmark.BOOKMARK_TYPE;
-import com.cyanogenmod.explorer.model.FileSystemObject;
-import com.cyanogenmod.explorer.preferences.Bookmarks;
-import com.cyanogenmod.explorer.util.DialogHelper;
-import com.cyanogenmod.explorer.util.ExceptionUtil;
+import com.cyanogenmod.filemanager.R;
+import com.cyanogenmod.filemanager.model.Bookmark;
+import com.cyanogenmod.filemanager.model.Bookmark.BOOKMARK_TYPE;
+import com.cyanogenmod.filemanager.model.FileSystemObject;
+import com.cyanogenmod.filemanager.preferences.Bookmarks;
+import com.cyanogenmod.filemanager.util.DialogHelper;
+import com.cyanogenmod.filemanager.util.ExceptionUtil;
 
 /**
  * A class with the convenience methods for resolve bookmarks related actions
diff --git a/src/com/cyanogenmod/explorer/ui/policy/CompressActionPolicy.java b/src/com/cyanogenmod/filemanager/ui/policy/CompressActionPolicy.java
index de5268d0..52c2d2bf 100644
--- a/src/com/cyanogenmod/explorer/ui/policy/CompressActionPolicy.java
+++ b/src/com/cyanogenmod/filemanager/ui/policy/CompressActionPolicy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.ui.policy;
+package com.cyanogenmod.filemanager.ui.policy;
 
 import android.app.AlertDialog;
 import android.content.Context;
@@ -23,24 +23,24 @@ import android.text.Html;
 import android.text.Spanned;
 import android.widget.Toast;
 
-import com.cyanogenmod.explorer.ExplorerApplication;
-import com.cyanogenmod.explorer.R;
-import com.cyanogenmod.explorer.commands.AsyncResultListener;
-import com.cyanogenmod.explorer.commands.CompressExecutable;
-import com.cyanogenmod.explorer.commands.UncompressExecutable;
-import com.cyanogenmod.explorer.console.ConsoleBuilder;
-import com.cyanogenmod.explorer.console.ExecutionException;
-import com.cyanogenmod.explorer.console.RelaunchableException;
-import com.cyanogenmod.explorer.listeners.OnRequestRefreshListener;
-import com.cyanogenmod.explorer.listeners.OnSelectionListener;
-import com.cyanogenmod.explorer.model.FileSystemObject;
-import com.cyanogenmod.explorer.preferences.CompressionMode;
-import com.cyanogenmod.explorer.util.CommandHelper;
-import com.cyanogenmod.explorer.util.DialogHelper;
-import com.cyanogenmod.explorer.util.ExceptionUtil;
-import com.cyanogenmod.explorer.util.ExceptionUtil.OnRelaunchCommandResult;
-import com.cyanogenmod.explorer.util.FileHelper;
-import com.cyanogenmod.explorer.util.FixedQueue;
+import com.cyanogenmod.filemanager.FileManagerApplication;
+import com.cyanogenmod.filemanager.R;
+import com.cyanogenmod.filemanager.commands.AsyncResultListener;
+import com.cyanogenmod.filemanager.commands.CompressExecutable;
+import com.cyanogenmod.filemanager.commands.UncompressExecutable;
+import com.cyanogenmod.filemanager.console.ConsoleBuilder;
+import com.cyanogenmod.filemanager.console.ExecutionException;
+import com.cyanogenmod.filemanager.console.RelaunchableException;
+import com.cyanogenmod.filemanager.listeners.OnRequestRefreshListener;
+import com.cyanogenmod.filemanager.listeners.OnSelectionListener;
+import com.cyanogenmod.filemanager.model.FileSystemObject;
+import com.cyanogenmod.filemanager.preferences.CompressionMode;
+import com.cyanogenmod.filemanager.util.CommandHelper;
+import com.cyanogenmod.filemanager.util.DialogHelper;
+import com.cyanogenmod.filemanager.util.ExceptionUtil;
+import com.cyanogenmod.filemanager.util.ExceptionUtil.OnRelaunchCommandResult;
+import com.cyanogenmod.filemanager.util.FileHelper;
+import com.cyanogenmod.filemanager.util.FixedQueue;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -441,7 +441,7 @@ public final class CompressActionPolicy extends ActionsPolicy {
                 // list, then discard them
                 String src = fsos.get(0).getFullPath();
                 CompressExecutable ucmd =
-                        ExplorerApplication.getBackgroundConsole().
+                        FileManagerApplication.getBackgroundConsole().
                             getExecutableFactory().newCreator().
                                 createCompressExecutable(mode, src, null);
                 String dst = ucmd.getOutCompressedFile();
@@ -689,7 +689,7 @@ public final class CompressActionPolicy extends ActionsPolicy {
         boolean askUser = false;
         try {
             UncompressExecutable ucmd =
-                    ExplorerApplication.getBackgroundConsole().
+                    FileManagerApplication.getBackgroundConsole().
                         getExecutableFactory().newCreator().
                             createUncompressExecutable(fso.getFullPath(), null, null);
             String dst = ucmd.getOutUncompressedFile();
diff --git a/src/com/cyanogenmod/explorer/ui/policy/CopyMoveActionPolicy.java b/src/com/cyanogenmod/filemanager/ui/policy/CopyMoveActionPolicy.java
index 2c1fa254..ccc2219f 100644
--- a/src/com/cyanogenmod/explorer/ui/policy/CopyMoveActionPolicy.java
+++ b/src/com/cyanogenmod/filemanager/ui/policy/CopyMoveActionPolicy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.ui.policy;
+package com.cyanogenmod.filemanager.ui.policy;
 
 import android.app.AlertDialog;
 import android.content.Context;
@@ -22,17 +22,17 @@ import android.content.DialogInterface;
 import android.text.Html;
 import android.text.Spanned;
 
-import com.cyanogenmod.explorer.R;
-import com.cyanogenmod.explorer.console.NoSuchFileOrDirectory;
-import com.cyanogenmod.explorer.console.RelaunchableException;
-import com.cyanogenmod.explorer.listeners.OnRequestRefreshListener;
-import com.cyanogenmod.explorer.listeners.OnSelectionListener;
-import com.cyanogenmod.explorer.model.FileSystemObject;
-import com.cyanogenmod.explorer.util.CommandHelper;
-import com.cyanogenmod.explorer.util.DialogHelper;
-import com.cyanogenmod.explorer.util.ExceptionUtil;
-import com.cyanogenmod.explorer.util.ExceptionUtil.OnRelaunchCommandResult;
-import com.cyanogenmod.explorer.util.FileHelper;
+import com.cyanogenmod.filemanager.R;
+import com.cyanogenmod.filemanager.console.NoSuchFileOrDirectory;
+import com.cyanogenmod.filemanager.console.RelaunchableException;
+import com.cyanogenmod.filemanager.listeners.OnRequestRefreshListener;
+import com.cyanogenmod.filemanager.listeners.OnSelectionListener;
+import com.cyanogenmod.filemanager.model.FileSystemObject;
+import com.cyanogenmod.filemanager.util.CommandHelper;
+import com.cyanogenmod.filemanager.util.DialogHelper;
+import com.cyanogenmod.filemanager.util.ExceptionUtil;
+import com.cyanogenmod.filemanager.util.ExceptionUtil.OnRelaunchCommandResult;
+import com.cyanogenmod.filemanager.util.FileHelper;
 
 import java.io.File;
 import java.util.ArrayList;
diff --git a/src/com/cyanogenmod/explorer/ui/policy/DeleteActionPolicy.java b/src/com/cyanogenmod/filemanager/ui/policy/DeleteActionPolicy.java
index 39d1a329..c6137cac 100644
--- a/src/com/cyanogenmod/explorer/ui/policy/DeleteActionPolicy.java
+++ b/src/com/cyanogenmod/filemanager/ui/policy/DeleteActionPolicy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.ui.policy;
+package com.cyanogenmod.filemanager.ui.policy;
 
 import android.app.AlertDialog;
 import android.content.Context;
@@ -22,17 +22,17 @@ import android.content.DialogInterface;
 import android.text.Html;
 import android.text.Spanned;
 
-import com.cyanogenmod.explorer.R;
-import com.cyanogenmod.explorer.console.ExecutionException;
-import com.cyanogenmod.explorer.console.RelaunchableException;
-import com.cyanogenmod.explorer.listeners.OnRequestRefreshListener;
-import com.cyanogenmod.explorer.listeners.OnSelectionListener;
-import com.cyanogenmod.explorer.model.FileSystemObject;
-import com.cyanogenmod.explorer.util.CommandHelper;
-import com.cyanogenmod.explorer.util.DialogHelper;
-import com.cyanogenmod.explorer.util.ExceptionUtil;
-import com.cyanogenmod.explorer.util.ExceptionUtil.OnRelaunchCommandResult;
-import com.cyanogenmod.explorer.util.FileHelper;
+import com.cyanogenmod.filemanager.R;
+import com.cyanogenmod.filemanager.console.ExecutionException;
+import com.cyanogenmod.filemanager.console.RelaunchableException;
+import com.cyanogenmod.filemanager.listeners.OnRequestRefreshListener;
+import com.cyanogenmod.filemanager.listeners.OnSelectionListener;
+import com.cyanogenmod.filemanager.model.FileSystemObject;
+import com.cyanogenmod.filemanager.util.CommandHelper;
+import com.cyanogenmod.filemanager.util.DialogHelper;
+import com.cyanogenmod.filemanager.util.ExceptionUtil;
+import com.cyanogenmod.filemanager.util.ExceptionUtil.OnRelaunchCommandResult;
+import com.cyanogenmod.filemanager.util.FileHelper;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/com/cyanogenmod/explorer/ui/policy/ExecutionActionPolicy.java b/src/com/cyanogenmod/filemanager/ui/policy/ExecutionActionPolicy.java
index ba20edda..efd106f1 100644
--- a/src/com/cyanogenmod/explorer/ui/policy/ExecutionActionPolicy.java
+++ b/src/com/cyanogenmod/filemanager/ui/policy/ExecutionActionPolicy.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.ui.policy;
+package com.cyanogenmod.filemanager.ui.policy;
 
 import android.content.Context;
 
-import com.cyanogenmod.explorer.commands.AsyncResultListener;
-import com.cyanogenmod.explorer.commands.ExecExecutable;
-import com.cyanogenmod.explorer.model.FileSystemObject;
-import com.cyanogenmod.explorer.ui.dialogs.ExecutionDialog;
-import com.cyanogenmod.explorer.util.CommandHelper;
-import com.cyanogenmod.explorer.util.ExceptionUtil;
+import com.cyanogenmod.filemanager.commands.AsyncResultListener;
+import com.cyanogenmod.filemanager.commands.ExecExecutable;
+import com.cyanogenmod.filemanager.model.FileSystemObject;
+import com.cyanogenmod.filemanager.ui.dialogs.ExecutionDialog;
+import com.cyanogenmod.filemanager.util.CommandHelper;
+import com.cyanogenmod.filemanager.util.ExceptionUtil;
 
 /**
  * A class with the convenience methods for resolve executions related actions
diff --git a/src/com/cyanogenmod/explorer/ui/policy/InfoActionPolicy.java b/src/com/cyanogenmod/filemanager/ui/policy/InfoActionPolicy.java
index 9e127598..e7a4704d 100644
--- a/src/com/cyanogenmod/explorer/ui/policy/InfoActionPolicy.java
+++ b/src/com/cyanogenmod/filemanager/ui/policy/InfoActionPolicy.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.ui.policy;
+package com.cyanogenmod.filemanager.ui.policy;
 
 import android.content.Context;
 import android.content.DialogInterface;
 import android.widget.Toast;
 
-import com.cyanogenmod.explorer.listeners.OnRequestRefreshListener;
-import com.cyanogenmod.explorer.model.FileSystemObject;
-import com.cyanogenmod.explorer.ui.dialogs.FsoPropertiesDialog;
-import com.cyanogenmod.explorer.util.DialogHelper;
+import com.cyanogenmod.filemanager.listeners.OnRequestRefreshListener;
+import com.cyanogenmod.filemanager.model.FileSystemObject;
+import com.cyanogenmod.filemanager.ui.dialogs.FsoPropertiesDialog;
+import com.cyanogenmod.filemanager.util.DialogHelper;
 
 /**
  * A class with the convenience methods for resolve the display of info actions
diff --git a/src/com/cyanogenmod/explorer/ui/policy/IntentsActionPolicy.java b/src/com/cyanogenmod/filemanager/ui/policy/IntentsActionPolicy.java
index 7b8f6dfc..ad6211f4 100644
--- a/src/com/cyanogenmod/explorer/ui/policy/IntentsActionPolicy.java
+++ b/src/com/cyanogenmod/filemanager/ui/policy/IntentsActionPolicy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.ui.policy;
+package com.cyanogenmod.filemanager.ui.policy;
 
 import android.content.Context;
 import android.content.DialogInterface.OnCancelListener;
@@ -27,16 +27,16 @@ import android.os.Bundle;
 import android.util.Log;
 import android.widget.Toast;
 
-import com.cyanogenmod.explorer.R;
-import com.cyanogenmod.explorer.activities.ShortcutActivity;
-import com.cyanogenmod.explorer.model.FileSystemObject;
-import com.cyanogenmod.explorer.model.RegularFile;
-import com.cyanogenmod.explorer.ui.dialogs.AssociationsDialog;
-import com.cyanogenmod.explorer.util.DialogHelper;
-import com.cyanogenmod.explorer.util.ExceptionUtil;
-import com.cyanogenmod.explorer.util.FileHelper;
-import com.cyanogenmod.explorer.util.MimeTypeHelper;
-import com.cyanogenmod.explorer.util.MimeTypeHelper.MimeTypeCategory;
+import com.cyanogenmod.filemanager.R;
+import com.cyanogenmod.filemanager.activities.ShortcutActivity;
+import com.cyanogenmod.filemanager.model.FileSystemObject;
+import com.cyanogenmod.filemanager.model.RegularFile;
+import com.cyanogenmod.filemanager.ui.dialogs.AssociationsDialog;
+import com.cyanogenmod.filemanager.util.DialogHelper;
+import com.cyanogenmod.filemanager.util.ExceptionUtil;
+import com.cyanogenmod.filemanager.util.FileHelper;
+import com.cyanogenmod.filemanager.util.MimeTypeHelper;
+import com.cyanogenmod.filemanager.util.MimeTypeHelper.MimeTypeCategory;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -55,19 +55,19 @@ public final class IntentsActionPolicy extends ActionsPolicy {
      * Extra field for the internal action
      */
     public static final String EXTRA_INTERNAL_ACTION =
-            "com.cyanogenmod.explorer.extra.INTERNAL_ACTION"; //$NON-NLS-1$
+            "com.cyanogenmod.filemanager.extra.INTERNAL_ACTION"; //$NON-NLS-1$
 
     /**
-     * Category for all the internal CMExplorer viewers
+     * Category for all the internal app viewers
      */
     public static final String CATEGORY_INTERNAL_VIEWER =
-            "com.cyanogenmod.explorer.category.INTERNAL_VIEWER"; //$NON-NLS-1$
+            "com.cyanogenmod.filemanager.category.INTERNAL_VIEWER"; //$NON-NLS-1$
 
     /**
-     * Category for all the CMExplorer editor
+     * Category for all the app editor
      */
     public static final String CATEGORY_EDITOR =
-            "com.cyanogenmod.explorer.category.EDITOR"; //$NON-NLS-1$
+            "com.cyanogenmod.filemanager.category.EDITOR"; //$NON-NLS-1$
 
     /**
      * Method that opens a {@link FileSystemObject} with the default registered application
diff --git a/src/com/cyanogenmod/explorer/ui/policy/NavigationActionPolicy.java b/src/com/cyanogenmod/filemanager/ui/policy/NavigationActionPolicy.java
index e720fe3c..020b38c0 100644
--- a/src/com/cyanogenmod/explorer/ui/policy/NavigationActionPolicy.java
+++ b/src/com/cyanogenmod/filemanager/ui/policy/NavigationActionPolicy.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.ui.policy;
+package com.cyanogenmod.filemanager.ui.policy;
 
 import android.content.Context;
 
-import com.cyanogenmod.explorer.console.NoSuchFileOrDirectory;
-import com.cyanogenmod.explorer.listeners.OnRequestRefreshListener;
-import com.cyanogenmod.explorer.model.FileSystemObject;
-import com.cyanogenmod.explorer.util.CommandHelper;
-import com.cyanogenmod.explorer.util.ExceptionUtil;
+import com.cyanogenmod.filemanager.console.NoSuchFileOrDirectory;
+import com.cyanogenmod.filemanager.listeners.OnRequestRefreshListener;
+import com.cyanogenmod.filemanager.model.FileSystemObject;
+import com.cyanogenmod.filemanager.util.CommandHelper;
+import com.cyanogenmod.filemanager.util.ExceptionUtil;
 
 /**
  * A class with the convenience methods for resolve navigation related actions
diff --git a/src/com/cyanogenmod/explorer/ui/policy/NewActionPolicy.java b/src/com/cyanogenmod/filemanager/ui/policy/NewActionPolicy.java
index d92681ee..6f0bad95 100644
--- a/src/com/cyanogenmod/explorer/ui/policy/NewActionPolicy.java
+++ b/src/com/cyanogenmod/filemanager/ui/policy/NewActionPolicy.java
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.ui.policy;
+package com.cyanogenmod.filemanager.ui.policy;
 
 import android.content.Context;
 import android.os.AsyncTask;
 import android.util.Log;
 
-import com.cyanogenmod.explorer.console.RelaunchableException;
-import com.cyanogenmod.explorer.listeners.OnRequestRefreshListener;
-import com.cyanogenmod.explorer.listeners.OnSelectionListener;
-import com.cyanogenmod.explorer.model.FileSystemObject;
-import com.cyanogenmod.explorer.util.CommandHelper;
-import com.cyanogenmod.explorer.util.ExceptionUtil;
+import com.cyanogenmod.filemanager.console.RelaunchableException;
+import com.cyanogenmod.filemanager.listeners.OnRequestRefreshListener;
+import com.cyanogenmod.filemanager.listeners.OnSelectionListener;
+import com.cyanogenmod.filemanager.model.FileSystemObject;
+import com.cyanogenmod.filemanager.util.CommandHelper;
+import com.cyanogenmod.filemanager.util.ExceptionUtil;
 
 import java.io.File;
 
diff --git a/src/com/cyanogenmod/explorer/ui/widgets/Breadcrumb.java b/src/com/cyanogenmod/filemanager/ui/widgets/Breadcrumb.java
index 4c41a83e..697c1e07 100644
--- a/src/com/cyanogenmod/explorer/ui/widgets/Breadcrumb.java
+++ b/src/com/cyanogenmod/filemanager/ui/widgets/Breadcrumb.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.ui.widgets;
+package com.cyanogenmod.filemanager.ui.widgets;
 
-import com.cyanogenmod.explorer.model.DiskUsage;
-import com.cyanogenmod.explorer.model.MountPoint;
+import com.cyanogenmod.filemanager.model.DiskUsage;
+import com.cyanogenmod.filemanager.model.MountPoint;
 
 /**
  * An interface that defines the breadcrumb operations.
diff --git a/src/com/cyanogenmod/explorer/ui/widgets/BreadcrumbItem.java b/src/com/cyanogenmod/filemanager/ui/widgets/BreadcrumbItem.java
index bd2b555f..3516ea6b 100644
--- a/src/com/cyanogenmod/explorer/ui/widgets/BreadcrumbItem.java
+++ b/src/com/cyanogenmod/filemanager/ui/widgets/BreadcrumbItem.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.ui.widgets;
+package com.cyanogenmod.filemanager.ui.widgets;
 
 import android.content.Context;
 import android.util.AttributeSet;
@@ -23,8 +23,8 @@ import android.view.View.OnLongClickListener;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.cyanogenmod.explorer.R;
-import com.cyanogenmod.explorer.util.DialogHelper;
+import com.cyanogenmod.filemanager.R;
+import com.cyanogenmod.filemanager.util.DialogHelper;
 
 /**
  * A class that represents a item of a breadcrumb.
diff --git a/src/com/cyanogenmod/explorer/ui/widgets/BreadcrumbListener.java b/src/com/cyanogenmod/filemanager/ui/widgets/BreadcrumbListener.java
index f745d5a1..1b1b7b78 100644
--- a/src/com/cyanogenmod/explorer/ui/widgets/BreadcrumbListener.java
+++ b/src/com/cyanogenmod/filemanager/ui/widgets/BreadcrumbListener.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.ui.widgets;
+package com.cyanogenmod.filemanager.ui.widgets;
 
 /**
  * Interface with events from a breadcrumb.
diff --git a/src/com/cyanogenmod/explorer/ui/widgets/BreadcrumbView.java b/src/com/cyanogenmod/filemanager/ui/widgets/BreadcrumbView.java
index 471e2f1e..a660b72e 100644
--- a/src/com/cyanogenmod/explorer/ui/widgets/BreadcrumbView.java
+++ b/src/com/cyanogenmod/filemanager/ui/widgets/BreadcrumbView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.ui.widgets;
+package com.cyanogenmod.filemanager.ui.widgets;
 
 import android.content.Context;
 import android.util.AttributeSet;
@@ -27,12 +27,12 @@ import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
 
-import com.cyanogenmod.explorer.R;
-import com.cyanogenmod.explorer.model.DiskUsage;
-import com.cyanogenmod.explorer.model.MountPoint;
-import com.cyanogenmod.explorer.tasks.FilesystemAsyncTask;
-import com.cyanogenmod.explorer.util.FileHelper;
-import com.cyanogenmod.explorer.util.StorageHelper;
+import com.cyanogenmod.filemanager.R;
+import com.cyanogenmod.filemanager.model.DiskUsage;
+import com.cyanogenmod.filemanager.model.MountPoint;
+import com.cyanogenmod.filemanager.tasks.FilesystemAsyncTask;
+import com.cyanogenmod.filemanager.util.FileHelper;
+import com.cyanogenmod.filemanager.util.StorageHelper;
 
 import java.io.File;
 import java.util.ArrayList;
diff --git a/src/com/cyanogenmod/explorer/ui/widgets/ButtonItem.java b/src/com/cyanogenmod/filemanager/ui/widgets/ButtonItem.java
index b4fdea09..504532b3 100644
--- a/src/com/cyanogenmod/explorer/ui/widgets/ButtonItem.java
+++ b/src/com/cyanogenmod/filemanager/ui/widgets/ButtonItem.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.ui.widgets;
+package com.cyanogenmod.filemanager.ui.widgets;
 
 import android.content.Context;
 import android.util.AttributeSet;
@@ -23,8 +23,8 @@ import android.view.View.OnLongClickListener;
 import android.widget.ImageButton;
 import android.widget.Toast;
 
-import com.cyanogenmod.explorer.R;
-import com.cyanogenmod.explorer.util.DialogHelper;
+import com.cyanogenmod.filemanager.R;
+import com.cyanogenmod.filemanager.util.DialogHelper;
 
 /**
  * A class that represents a button from an action bar.
diff --git a/src/com/cyanogenmod/explorer/ui/widgets/DirectoryInlineAutocompleteTextView.java b/src/com/cyanogenmod/filemanager/ui/widgets/DirectoryInlineAutocompleteTextView.java
index c8b06f74..498f017b 100644
--- a/src/com/cyanogenmod/explorer/ui/widgets/DirectoryInlineAutocompleteTextView.java
+++ b/src/com/cyanogenmod/filemanager/ui/widgets/DirectoryInlineAutocompleteTextView.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.ui.widgets;
+package com.cyanogenmod.filemanager.ui.widgets;
 
 import android.content.Context;
 import android.util.AttributeSet;
 import android.util.Log;
 
-import com.cyanogenmod.explorer.util.CommandHelper;
-import com.cyanogenmod.explorer.util.FileHelper;
+import com.cyanogenmod.filemanager.util.CommandHelper;
+import com.cyanogenmod.filemanager.util.FileHelper;
 
 import java.io.File;
 import java.util.List;
diff --git a/src/com/cyanogenmod/explorer/ui/widgets/DiskUsageGraph.java b/src/com/cyanogenmod/filemanager/ui/widgets/DiskUsageGraph.java
index 73deeb90..6fdd73f4 100644
--- a/src/com/cyanogenmod/explorer/ui/widgets/DiskUsageGraph.java
+++ b/src/com/cyanogenmod/filemanager/ui/widgets/DiskUsageGraph.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.ui.widgets;
+package com.cyanogenmod.filemanager.ui.widgets;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -25,8 +25,8 @@ import android.graphics.RectF;
 import android.util.AttributeSet;
 import android.view.View;
 
-import com.cyanogenmod.explorer.R;
-import com.cyanogenmod.explorer.model.DiskUsage;
+import com.cyanogenmod.filemanager.R;
+import com.cyanogenmod.filemanager.model.DiskUsage;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/com/cyanogenmod/explorer/ui/widgets/InlineAutocompleteTextView.java b/src/com/cyanogenmod/filemanager/ui/widgets/InlineAutocompleteTextView.java
index 45a3d4d8..b4094afd 100644
--- a/src/com/cyanogenmod/explorer/ui/widgets/InlineAutocompleteTextView.java
+++ b/src/com/cyanogenmod/filemanager/ui/widgets/InlineAutocompleteTextView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.ui.widgets;
+package com.cyanogenmod.filemanager.ui.widgets;
 
 import android.app.Activity;
 import android.content.Context;
@@ -32,8 +32,8 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.cyanogenmod.explorer.R;
-import com.cyanogenmod.explorer.util.DialogHelper;
+import com.cyanogenmod.filemanager.R;
+import com.cyanogenmod.filemanager.util.DialogHelper;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/src/com/cyanogenmod/explorer/ui/widgets/NavigationCustomTitleView.java b/src/com/cyanogenmod/filemanager/ui/widgets/NavigationCustomTitleView.java
index 7f72d5f8..90dde597 100644
--- a/src/com/cyanogenmod/explorer/ui/widgets/NavigationCustomTitleView.java
+++ b/src/com/cyanogenmod/filemanager/ui/widgets/NavigationCustomTitleView.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.ui.widgets;
+package com.cyanogenmod.filemanager.ui.widgets;
 
 import android.content.Context;
 import android.util.AttributeSet;
 import android.widget.ViewFlipper;
 
-import com.cyanogenmod.explorer.R;
-import com.cyanogenmod.explorer.listeners.OnHistoryListener;
+import com.cyanogenmod.filemanager.R;
+import com.cyanogenmod.filemanager.listeners.OnHistoryListener;
 
 /**
  * A {@link ViewFlipper} implementation for the navigation custom title.
diff --git a/src/com/cyanogenmod/explorer/ui/widgets/NavigationView.java b/src/com/cyanogenmod/filemanager/ui/widgets/NavigationView.java
index 90495cb9..40035331 100644
--- a/src/com/cyanogenmod/explorer/ui/widgets/NavigationView.java
+++ b/src/com/cyanogenmod/filemanager/ui/widgets/NavigationView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.ui.widgets;
+package com.cyanogenmod.filemanager.ui.widgets;
 
 import android.app.Activity;
 import android.content.Context;
@@ -30,35 +30,35 @@ import android.widget.ListAdapter;
 import android.widget.RelativeLayout;
 import android.widget.Toast;
 
-import com.cyanogenmod.explorer.ExplorerApplication;
-import com.cyanogenmod.explorer.R;
-import com.cyanogenmod.explorer.adapters.FileSystemObjectAdapter;
-import com.cyanogenmod.explorer.adapters.FileSystemObjectAdapter.OnRequestMenuListener;
-import com.cyanogenmod.explorer.adapters.FileSystemObjectAdapter.OnSelectionChangedListener;
-import com.cyanogenmod.explorer.console.ConsoleAllocException;
-import com.cyanogenmod.explorer.listeners.OnHistoryListener;
-import com.cyanogenmod.explorer.listeners.OnRequestRefreshListener;
-import com.cyanogenmod.explorer.listeners.OnSelectionListener;
-import com.cyanogenmod.explorer.model.Directory;
-import com.cyanogenmod.explorer.model.FileSystemObject;
-import com.cyanogenmod.explorer.model.ParentDirectory;
-import com.cyanogenmod.explorer.model.Symlink;
-import com.cyanogenmod.explorer.parcelables.NavigationViewInfoParcelable;
-import com.cyanogenmod.explorer.parcelables.SearchInfoParcelable;
-import com.cyanogenmod.explorer.preferences.DefaultLongClickAction;
-import com.cyanogenmod.explorer.preferences.ExplorerSettings;
-import com.cyanogenmod.explorer.preferences.NavigationLayoutMode;
-import com.cyanogenmod.explorer.preferences.ObjectIdentifier;
-import com.cyanogenmod.explorer.preferences.ObjectStringIdentifier;
-import com.cyanogenmod.explorer.preferences.Preferences;
-import com.cyanogenmod.explorer.ui.policy.InfoActionPolicy;
-import com.cyanogenmod.explorer.ui.policy.IntentsActionPolicy;
-import com.cyanogenmod.explorer.util.CommandHelper;
-import com.cyanogenmod.explorer.util.DialogHelper;
-import com.cyanogenmod.explorer.util.ExceptionUtil;
-import com.cyanogenmod.explorer.util.FileHelper;
-import com.cyanogenmod.explorer.util.MimeTypeHelper;
-import com.cyanogenmod.explorer.util.StorageHelper;
+import com.cyanogenmod.filemanager.FileManagerApplication;
+import com.cyanogenmod.filemanager.R;
+import com.cyanogenmod.filemanager.adapters.FileSystemObjectAdapter;
+import com.cyanogenmod.filemanager.adapters.FileSystemObjectAdapter.OnRequestMenuListener;
+import com.cyanogenmod.filemanager.adapters.FileSystemObjectAdapter.OnSelectionChangedListener;
+import com.cyanogenmod.filemanager.console.ConsoleAllocException;
+import com.cyanogenmod.filemanager.listeners.OnHistoryListener;
+import com.cyanogenmod.filemanager.listeners.OnRequestRefreshListener;
+import com.cyanogenmod.filemanager.listeners.OnSelectionListener;
+import com.cyanogenmod.filemanager.model.Directory;
+import com.cyanogenmod.filemanager.model.FileSystemObject;
+import com.cyanogenmod.filemanager.model.ParentDirectory;
+import com.cyanogenmod.filemanager.model.Symlink;
+import com.cyanogenmod.filemanager.parcelables.NavigationViewInfoParcelable;
+import com.cyanogenmod.filemanager.parcelables.SearchInfoParcelable;
+import com.cyanogenmod.filemanager.preferences.DefaultLongClickAction;
+import com.cyanogenmod.filemanager.preferences.FileManagerSettings;
+import com.cyanogenmod.filemanager.preferences.NavigationLayoutMode;
+import com.cyanogenmod.filemanager.preferences.ObjectIdentifier;
+import com.cyanogenmod.filemanager.preferences.ObjectStringIdentifier;
+import com.cyanogenmod.filemanager.preferences.Preferences;
+import com.cyanogenmod.filemanager.ui.policy.InfoActionPolicy;
+import com.cyanogenmod.filemanager.ui.policy.IntentsActionPolicy;
+import com.cyanogenmod.filemanager.util.CommandHelper;
+import com.cyanogenmod.filemanager.util.DialogHelper;
+import com.cyanogenmod.filemanager.util.ExceptionUtil;
+import com.cyanogenmod.filemanager.util.FileHelper;
+import com.cyanogenmod.filemanager.util.MimeTypeHelper;
+import com.cyanogenmod.filemanager.util.StorageHelper;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -273,14 +273,14 @@ public class NavigationView extends RelativeLayout implements
             // Pick mode is always ChRooted
             this.mChRooted = true;
         } else {
-            this.mChRooted = !ExplorerApplication.isAdvancedMode();
+            this.mChRooted = !FileManagerApplication.isAdvancedMode();
         }
 
         // Default long-click action
-        String defaultValue = ((ObjectStringIdentifier)ExplorerSettings.
+        String defaultValue = ((ObjectStringIdentifier)FileManagerSettings.
                 SETTINGS_DEFAULT_LONG_CLICK_ACTION.getDefaultValue()).getId();
         String value = Preferences.getSharedPreferences().getString(
-                            ExplorerSettings.SETTINGS_DEFAULT_LONG_CLICK_ACTION.getId(),
+                            FileManagerSettings.SETTINGS_DEFAULT_LONG_CLICK_ACTION.getId(),
                             defaultValue);
         DefaultLongClickAction lcMode = DefaultLongClickAction.fromId(value);
         this.mDefaultLongClickAction = lcMode;
@@ -289,8 +289,8 @@ public class NavigationView extends RelativeLayout implements
         if (this.mNavigationMode.compareTo(NAVIGATION_MODE.BROWSABLE) == 0) {
             SharedPreferences preferences = Preferences.getSharedPreferences();
             int viewMode = preferences.getInt(
-                    ExplorerSettings.SETTINGS_LAYOUT_MODE.getId(),
-                    ((ObjectIdentifier)ExplorerSettings.
+                    FileManagerSettings.SETTINGS_LAYOUT_MODE.getId(),
+                    ((ObjectIdentifier)FileManagerSettings.
                             SETTINGS_LAYOUT_MODE.getDefaultValue()).getId());
             changeViewMode(NavigationLayoutMode.fromId(viewMode));
         } else {
@@ -569,7 +569,7 @@ public class NavigationView extends RelativeLayout implements
             if (this.mNavigationMode.compareTo(NAVIGATION_MODE.BROWSABLE) == 0) {
                 try {
                     Preferences.savePreference(
-                            ExplorerSettings.SETTINGS_LAYOUT_MODE, newMode, true);
+                            FileManagerSettings.SETTINGS_LAYOUT_MODE, newMode, true);
                 } catch (Exception ex) {
                     Log.e(TAG, "Save of view mode preference fails", ex); //$NON-NLS-1$
                 }
diff --git a/src/com/cyanogenmod/explorer/ui/widgets/NonFocusableButtonItem.java b/src/com/cyanogenmod/filemanager/ui/widgets/NonFocusableButtonItem.java
index ab91677f..8239602b 100644
--- a/src/com/cyanogenmod/explorer/ui/widgets/NonFocusableButtonItem.java
+++ b/src/com/cyanogenmod/filemanager/ui/widgets/NonFocusableButtonItem.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.ui.widgets;
+package com.cyanogenmod.filemanager.ui.widgets;
 
 import android.content.Context;
 import android.util.AttributeSet;
 
-import com.cyanogenmod.explorer.R;
+import com.cyanogenmod.filemanager.R;
 
 /**
  * A class that represents a button from an action bar that can't gain focus.
diff --git a/src/com/cyanogenmod/explorer/ui/widgets/RelevanceView.java b/src/com/cyanogenmod/filemanager/ui/widgets/RelevanceView.java
index ff8d5f67..0cf73417 100644
--- a/src/com/cyanogenmod/explorer/ui/widgets/RelevanceView.java
+++ b/src/com/cyanogenmod/filemanager/ui/widgets/RelevanceView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.ui.widgets;
+package com.cyanogenmod.filemanager.ui.widgets;
 
 import android.content.Context;
 import android.graphics.Canvas;
@@ -24,7 +24,7 @@ import android.os.Looper;
 import android.util.AttributeSet;
 import android.view.View;
 
-import com.cyanogenmod.explorer.R;
+import com.cyanogenmod.filemanager.R;
 
 import java.util.Iterator;
 import java.util.Map;
diff --git a/src/com/cyanogenmod/explorer/ui/widgets/SelectionView.java b/src/com/cyanogenmod/filemanager/ui/widgets/SelectionView.java
index f067da26..9dfb6d7a 100644
--- a/src/com/cyanogenmod/explorer/ui/widgets/SelectionView.java
+++ b/src/com/cyanogenmod/filemanager/ui/widgets/SelectionView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.ui.widgets;
+package com.cyanogenmod.filemanager.ui.widgets;
 
 import android.content.Context;
 import android.util.AttributeSet;
@@ -27,9 +27,9 @@ import android.view.animation.Transformation;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.cyanogenmod.explorer.R;
-import com.cyanogenmod.explorer.model.FileSystemObject;
-import com.cyanogenmod.explorer.util.FileHelper;
+import com.cyanogenmod.filemanager.R;
+import com.cyanogenmod.filemanager.model.FileSystemObject;
+import com.cyanogenmod.filemanager.util.FileHelper;
 
 import java.util.List;
 
diff --git a/src/com/cyanogenmod/explorer/ui/widgets/TransparentNonFocusableButtonItem.java b/src/com/cyanogenmod/filemanager/ui/widgets/TransparentNonFocusableButtonItem.java
index bb099d7a..2eb9da6d 100644
--- a/src/com/cyanogenmod/explorer/ui/widgets/TransparentNonFocusableButtonItem.java
+++ b/src/com/cyanogenmod/filemanager/ui/widgets/TransparentNonFocusableButtonItem.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.ui.widgets;
+package com.cyanogenmod.filemanager.ui.widgets;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/src/com/cyanogenmod/explorer/util/AIDHelper.java b/src/com/cyanogenmod/filemanager/util/AIDHelper.java
index 2d2ab008..c94cf2d3 100644
--- a/src/com/cyanogenmod/explorer/util/AIDHelper.java
+++ b/src/com/cyanogenmod/filemanager/util/AIDHelper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.util;
+package com.cyanogenmod.filemanager.util;
 
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
@@ -22,8 +22,8 @@ import android.content.pm.PackageManager;
 import android.util.Log;
 import android.util.SparseArray;
 
-import com.cyanogenmod.explorer.R;
-import com.cyanogenmod.explorer.model.AID;
+import com.cyanogenmod.filemanager.R;
+import com.cyanogenmod.filemanager.model.AID;
 
 import java.util.Iterator;
 import java.util.List;
diff --git a/src/com/cyanogenmod/explorer/util/BookmarksHelper.java b/src/com/cyanogenmod/filemanager/util/BookmarksHelper.java
index 106ee010..309e01d1 100644
--- a/src/com/cyanogenmod/explorer/util/BookmarksHelper.java
+++ b/src/com/cyanogenmod/filemanager/util/BookmarksHelper.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.util;
+package com.cyanogenmod.filemanager.util;
 
-import com.cyanogenmod.explorer.R;
-import com.cyanogenmod.explorer.model.Bookmark;
+import com.cyanogenmod.filemanager.R;
+import com.cyanogenmod.filemanager.model.Bookmark;
 
 /**
  * A helper class with useful methods for deal with bookmarks.
diff --git a/src/com/cyanogenmod/explorer/util/CommandHelper.java b/src/com/cyanogenmod/filemanager/util/CommandHelper.java
index 6a704d02..eaf725a9 100644
--- a/src/com/cyanogenmod/explorer/util/CommandHelper.java
+++ b/src/com/cyanogenmod/filemanager/util/CommandHelper.java
@@ -14,66 +14,66 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.util;
+package com.cyanogenmod.filemanager.util;
 
 import android.content.Context;
 
-import com.cyanogenmod.explorer.commands.AsyncResultListener;
-import com.cyanogenmod.explorer.commands.ChangeCurrentDirExecutable;
-import com.cyanogenmod.explorer.commands.ChangeOwnerExecutable;
-import com.cyanogenmod.explorer.commands.ChangePermissionsExecutable;
-import com.cyanogenmod.explorer.commands.CompressExecutable;
-import com.cyanogenmod.explorer.commands.CopyExecutable;
-import com.cyanogenmod.explorer.commands.CreateDirExecutable;
-import com.cyanogenmod.explorer.commands.CreateFileExecutable;
-import com.cyanogenmod.explorer.commands.CurrentDirExecutable;
-import com.cyanogenmod.explorer.commands.DeleteDirExecutable;
-import com.cyanogenmod.explorer.commands.DeleteFileExecutable;
-import com.cyanogenmod.explorer.commands.DiskUsageExecutable;
-import com.cyanogenmod.explorer.commands.EchoExecutable;
-import com.cyanogenmod.explorer.commands.ExecExecutable;
-import com.cyanogenmod.explorer.commands.Executable;
-import com.cyanogenmod.explorer.commands.FindExecutable;
-import com.cyanogenmod.explorer.commands.FolderUsageExecutable;
-import com.cyanogenmod.explorer.commands.GroupsExecutable;
-import com.cyanogenmod.explorer.commands.IdentityExecutable;
-import com.cyanogenmod.explorer.commands.LinkExecutable;
-import com.cyanogenmod.explorer.commands.ListExecutable;
-import com.cyanogenmod.explorer.commands.MountExecutable;
-import com.cyanogenmod.explorer.commands.MountPointInfoExecutable;
-import com.cyanogenmod.explorer.commands.MoveExecutable;
-import com.cyanogenmod.explorer.commands.ParentDirExecutable;
-import com.cyanogenmod.explorer.commands.ProcessIdExecutable;
-import com.cyanogenmod.explorer.commands.QuickFolderSearchExecutable;
-import com.cyanogenmod.explorer.commands.ReadExecutable;
-import com.cyanogenmod.explorer.commands.ResolveLinkExecutable;
-import com.cyanogenmod.explorer.commands.SIGNAL;
-import com.cyanogenmod.explorer.commands.SendSignalExecutable;
-import com.cyanogenmod.explorer.commands.SyncResultExecutable;
-import com.cyanogenmod.explorer.commands.UncompressExecutable;
-import com.cyanogenmod.explorer.commands.WritableExecutable;
-import com.cyanogenmod.explorer.commands.WriteExecutable;
-import com.cyanogenmod.explorer.commands.shell.InvalidCommandDefinitionException;
-import com.cyanogenmod.explorer.console.CommandNotFoundException;
-import com.cyanogenmod.explorer.console.Console;
-import com.cyanogenmod.explorer.console.ConsoleAllocException;
-import com.cyanogenmod.explorer.console.ConsoleBuilder;
-import com.cyanogenmod.explorer.console.ExecutionException;
-import com.cyanogenmod.explorer.console.InsufficientPermissionsException;
-import com.cyanogenmod.explorer.console.NoSuchFileOrDirectory;
-import com.cyanogenmod.explorer.console.OperationTimeoutException;
-import com.cyanogenmod.explorer.console.ReadOnlyFilesystemException;
-import com.cyanogenmod.explorer.model.DiskUsage;
-import com.cyanogenmod.explorer.model.FileSystemObject;
-import com.cyanogenmod.explorer.model.FolderUsage;
-import com.cyanogenmod.explorer.model.Group;
-import com.cyanogenmod.explorer.model.Identity;
-import com.cyanogenmod.explorer.model.MountPoint;
-import com.cyanogenmod.explorer.model.Permissions;
-import com.cyanogenmod.explorer.model.Query;
-import com.cyanogenmod.explorer.model.SearchResult;
-import com.cyanogenmod.explorer.model.User;
-import com.cyanogenmod.explorer.preferences.CompressionMode;
+import com.cyanogenmod.filemanager.commands.AsyncResultListener;
+import com.cyanogenmod.filemanager.commands.ChangeCurrentDirExecutable;
+import com.cyanogenmod.filemanager.commands.ChangeOwnerExecutable;
+import com.cyanogenmod.filemanager.commands.ChangePermissionsExecutable;
+import com.cyanogenmod.filemanager.commands.CompressExecutable;
+import com.cyanogenmod.filemanager.commands.CopyExecutable;
+import com.cyanogenmod.filemanager.commands.CreateDirExecutable;
+import com.cyanogenmod.filemanager.commands.CreateFileExecutable;
+import com.cyanogenmod.filemanager.commands.CurrentDirExecutable;
+import com.cyanogenmod.filemanager.commands.DeleteDirExecutable;
+import com.cyanogenmod.filemanager.commands.DeleteFileExecutable;
+import com.cyanogenmod.filemanager.commands.DiskUsageExecutable;
+import com.cyanogenmod.filemanager.commands.EchoExecutable;
+import com.cyanogenmod.filemanager.commands.ExecExecutable;
+import com.cyanogenmod.filemanager.commands.Executable;
+import com.cyanogenmod.filemanager.commands.FindExecutable;
+import com.cyanogenmod.filemanager.commands.FolderUsageExecutable;
+import com.cyanogenmod.filemanager.commands.GroupsExecutable;
+import com.cyanogenmod.filemanager.commands.IdentityExecutable;
+import com.cyanogenmod.filemanager.commands.LinkExecutable;
+import com.cyanogenmod.filemanager.commands.ListExecutable;
+import com.cyanogenmod.filemanager.commands.MountExecutable;
+import com.cyanogenmod.filemanager.commands.MountPointInfoExecutable;
+import com.cyanogenmod.filemanager.commands.MoveExecutable;
+import com.cyanogenmod.filemanager.commands.ParentDirExecutable;
+import com.cyanogenmod.filemanager.commands.ProcessIdExecutable;
+import com.cyanogenmod.filemanager.commands.QuickFolderSearchExecutable;
+import com.cyanogenmod.filemanager.commands.ReadExecutable;
+import com.cyanogenmod.filemanager.commands.ResolveLinkExecutable;
+import com.cyanogenmod.filemanager.commands.SIGNAL;
+import com.cyanogenmod.filemanager.commands.SendSignalExecutable;
+import com.cyanogenmod.filemanager.commands.SyncResultExecutable;
+import com.cyanogenmod.filemanager.commands.UncompressExecutable;
+import com.cyanogenmod.filemanager.commands.WritableExecutable;
+import com.cyanogenmod.filemanager.commands.WriteExecutable;
+import com.cyanogenmod.filemanager.commands.shell.InvalidCommandDefinitionException;
+import com.cyanogenmod.filemanager.console.CommandNotFoundException;
+import com.cyanogenmod.filemanager.console.Console;
+import com.cyanogenmod.filemanager.console.ConsoleAllocException;
+import com.cyanogenmod.filemanager.console.ConsoleBuilder;
+import com.cyanogenmod.filemanager.console.ExecutionException;
+import com.cyanogenmod.filemanager.console.InsufficientPermissionsException;
+import com.cyanogenmod.filemanager.console.NoSuchFileOrDirectory;
+import com.cyanogenmod.filemanager.console.OperationTimeoutException;
+import com.cyanogenmod.filemanager.console.ReadOnlyFilesystemException;
+import com.cyanogenmod.filemanager.model.DiskUsage;
+import com.cyanogenmod.filemanager.model.FileSystemObject;
+import com.cyanogenmod.filemanager.model.FolderUsage;
+import com.cyanogenmod.filemanager.model.Group;
+import com.cyanogenmod.filemanager.model.Identity;
+import com.cyanogenmod.filemanager.model.MountPoint;
+import com.cyanogenmod.filemanager.model.Permissions;
+import com.cyanogenmod.filemanager.model.Query;
+import com.cyanogenmod.filemanager.model.SearchResult;
+import com.cyanogenmod.filemanager.model.User;
+import com.cyanogenmod.filemanager.preferences.CompressionMode;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
diff --git a/src/com/cyanogenmod/explorer/util/DialogHelper.java b/src/com/cyanogenmod/filemanager/util/DialogHelper.java
index 8375c1d9..4bca79ae 100644
--- a/src/com/cyanogenmod/explorer/util/DialogHelper.java
+++ b/src/com/cyanogenmod/filemanager/util/DialogHelper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.util;
+package com.cyanogenmod.filemanager.util;
 
 import android.app.AlertDialog;
 import android.content.Context;
@@ -33,8 +33,8 @@ import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.cyanogenmod.explorer.R;
-import com.cyanogenmod.explorer.adapters.CheckableListAdapter;
+import com.cyanogenmod.filemanager.R;
+import com.cyanogenmod.filemanager.adapters.CheckableListAdapter;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/cyanogenmod/explorer/util/ExceptionUtil.java b/src/com/cyanogenmod/filemanager/util/ExceptionUtil.java
index fba4f8b9..c5873849 100644
--- a/src/com/cyanogenmod/explorer/util/ExceptionUtil.java
+++ b/src/com/cyanogenmod/filemanager/util/ExceptionUtil.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.util;
+package com.cyanogenmod.filemanager.util;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -25,19 +25,19 @@ import android.os.AsyncTask;
 import android.util.Log;
 import android.widget.Toast;
 
-import com.cyanogenmod.explorer.ExplorerApplication;
-import com.cyanogenmod.explorer.R;
-import com.cyanogenmod.explorer.commands.SyncResultExecutable;
-import com.cyanogenmod.explorer.commands.shell.InvalidCommandDefinitionException;
-import com.cyanogenmod.explorer.console.CommandNotFoundException;
-import com.cyanogenmod.explorer.console.ConsoleAllocException;
-import com.cyanogenmod.explorer.console.ConsoleBuilder;
-import com.cyanogenmod.explorer.console.ExecutionException;
-import com.cyanogenmod.explorer.console.InsufficientPermissionsException;
-import com.cyanogenmod.explorer.console.NoSuchFileOrDirectory;
-import com.cyanogenmod.explorer.console.OperationTimeoutException;
-import com.cyanogenmod.explorer.console.ReadOnlyFilesystemException;
-import com.cyanogenmod.explorer.console.RelaunchableException;
+import com.cyanogenmod.filemanager.FileManagerApplication;
+import com.cyanogenmod.filemanager.R;
+import com.cyanogenmod.filemanager.commands.SyncResultExecutable;
+import com.cyanogenmod.filemanager.commands.shell.InvalidCommandDefinitionException;
+import com.cyanogenmod.filemanager.console.CommandNotFoundException;
+import com.cyanogenmod.filemanager.console.ConsoleAllocException;
+import com.cyanogenmod.filemanager.console.ConsoleBuilder;
+import com.cyanogenmod.filemanager.console.ExecutionException;
+import com.cyanogenmod.filemanager.console.InsufficientPermissionsException;
+import com.cyanogenmod.filemanager.console.NoSuchFileOrDirectory;
+import com.cyanogenmod.filemanager.console.OperationTimeoutException;
+import com.cyanogenmod.filemanager.console.ReadOnlyFilesystemException;
+import com.cyanogenmod.filemanager.console.RelaunchableException;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -253,7 +253,7 @@ public final class ExceptionUtil {
         // If console is privileged there is not need to change
         // If we are in a ChRooted environment, resolve the error without do anymore
         if (relaunchable instanceof InsufficientPermissionsException &&
-                (isPrivileged || !ExplorerApplication.isAdvancedMode())) {
+                (isPrivileged || !FileManagerApplication.isAdvancedMode())) {
             translateException(
                     context, relaunchable, quiet, false, null);
 
diff --git a/src/com/cyanogenmod/explorer/util/FileHelper.java b/src/com/cyanogenmod/filemanager/util/FileHelper.java
index b62b7f64..ba6c05e7 100644
--- a/src/com/cyanogenmod/explorer/util/FileHelper.java
+++ b/src/com/cyanogenmod/filemanager/util/FileHelper.java
@@ -14,34 +14,34 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.util;
+package com.cyanogenmod.filemanager.util;
 
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.util.Log;
 
-import com.cyanogenmod.explorer.ExplorerApplication;
-import com.cyanogenmod.explorer.R;
-import com.cyanogenmod.explorer.commands.shell.ResolveLinkCommand;
-import com.cyanogenmod.explorer.model.AID;
-import com.cyanogenmod.explorer.model.BlockDevice;
-import com.cyanogenmod.explorer.model.CharacterDevice;
-import com.cyanogenmod.explorer.model.Directory;
-import com.cyanogenmod.explorer.model.DomainSocket;
-import com.cyanogenmod.explorer.model.FileSystemObject;
-import com.cyanogenmod.explorer.model.Group;
-import com.cyanogenmod.explorer.model.NamedPipe;
-import com.cyanogenmod.explorer.model.ParentDirectory;
-import com.cyanogenmod.explorer.model.Permissions;
-import com.cyanogenmod.explorer.model.RegularFile;
-import com.cyanogenmod.explorer.model.Symlink;
-import com.cyanogenmod.explorer.model.SystemFile;
-import com.cyanogenmod.explorer.model.User;
-import com.cyanogenmod.explorer.preferences.ExplorerSettings;
-import com.cyanogenmod.explorer.preferences.NavigationSortMode;
-import com.cyanogenmod.explorer.preferences.ObjectIdentifier;
-import com.cyanogenmod.explorer.preferences.Preferences;
+import com.cyanogenmod.filemanager.FileManagerApplication;
+import com.cyanogenmod.filemanager.R;
+import com.cyanogenmod.filemanager.commands.shell.ResolveLinkCommand;
+import com.cyanogenmod.filemanager.model.AID;
+import com.cyanogenmod.filemanager.model.BlockDevice;
+import com.cyanogenmod.filemanager.model.CharacterDevice;
+import com.cyanogenmod.filemanager.model.Directory;
+import com.cyanogenmod.filemanager.model.DomainSocket;
+import com.cyanogenmod.filemanager.model.FileSystemObject;
+import com.cyanogenmod.filemanager.model.Group;
+import com.cyanogenmod.filemanager.model.NamedPipe;
+import com.cyanogenmod.filemanager.model.ParentDirectory;
+import com.cyanogenmod.filemanager.model.Permissions;
+import com.cyanogenmod.filemanager.model.RegularFile;
+import com.cyanogenmod.filemanager.model.Symlink;
+import com.cyanogenmod.filemanager.model.SystemFile;
+import com.cyanogenmod.filemanager.model.User;
+import com.cyanogenmod.filemanager.preferences.FileManagerSettings;
+import com.cyanogenmod.filemanager.preferences.NavigationSortMode;
+import com.cyanogenmod.filemanager.preferences.ObjectIdentifier;
+import com.cyanogenmod.filemanager.preferences.Preferences;
 
 import java.io.File;
 import java.io.IOException;
@@ -152,7 +152,7 @@ public final class FileHelper {
      * @return String The human readable size
      */
     public static String getHumanReadableSize(long size) {
-        Resources res = ExplorerApplication.getInstance().getResources();
+        Resources res = FileManagerApplication.getInstance().getResources();
         final String format = "%d %s"; //$NON-NLS-1$
         final int[] magnitude = {
                                  R.string.size_bytes,
@@ -476,11 +476,11 @@ public final class FileHelper {
             List<FileSystemObject> files, String mimeType, boolean noSort, boolean chRooted) {
         //Retrieve user preferences
         SharedPreferences prefs = Preferences.getSharedPreferences();
-        ExplorerSettings sortModePref = ExplorerSettings.SETTINGS_SORT_MODE;
-        ExplorerSettings showDirsFirstPref = ExplorerSettings.SETTINGS_SHOW_DIRS_FIRST;
-        ExplorerSettings showHiddenPref = ExplorerSettings.SETTINGS_SHOW_HIDDEN;
-        ExplorerSettings showSystemPref = ExplorerSettings.SETTINGS_SHOW_SYSTEM;
-        ExplorerSettings showSymlinksPref = ExplorerSettings.SETTINGS_SHOW_SYMLINKS;
+        FileManagerSettings sortModePref = FileManagerSettings.SETTINGS_SORT_MODE;
+        FileManagerSettings showDirsFirstPref = FileManagerSettings.SETTINGS_SHOW_DIRS_FIRST;
+        FileManagerSettings showHiddenPref = FileManagerSettings.SETTINGS_SHOW_HIDDEN;
+        FileManagerSettings showSystemPref = FileManagerSettings.SETTINGS_SHOW_SYSTEM;
+        FileManagerSettings showSymlinksPref = FileManagerSettings.SETTINGS_SHOW_SYMLINKS;
 
         //Remove all unnecessary files (no required by the user)
         int cc = files.size();
@@ -618,8 +618,8 @@ public final class FileHelper {
         boolean caseSensitive =
                 Preferences.getSharedPreferences().
                     getBoolean(
-                        ExplorerSettings.SETTINGS_CASE_SENSITIVE_SORT.getId(),
-                        ((Boolean)ExplorerSettings.SETTINGS_CASE_SENSITIVE_SORT.
+                        FileManagerSettings.SETTINGS_CASE_SENSITIVE_SORT.getId(),
+                        ((Boolean)FileManagerSettings.SETTINGS_CASE_SENSITIVE_SORT.
                                 getDefaultValue()).booleanValue());
 
         //Name (ascending)
diff --git a/src/com/cyanogenmod/explorer/util/FixedQueue.java b/src/com/cyanogenmod/filemanager/util/FixedQueue.java
index 72bee67d..47b6aebe 100644
--- a/src/com/cyanogenmod/explorer/util/FixedQueue.java
+++ b/src/com/cyanogenmod/filemanager/util/FixedQueue.java
@@ -14,7 +14,7 @@
  * limitations under the License.

  */

 

-package com.cyanogenmod.explorer.util;

+package com.cyanogenmod.filemanager.util;

 

 import java.util.ArrayList;

 import java.util.List;

diff --git a/src/com/cyanogenmod/explorer/util/MimeTypeHelper.java b/src/com/cyanogenmod/filemanager/util/MimeTypeHelper.java
index 0eae54a7..e983fea2 100644
--- a/src/com/cyanogenmod/explorer/util/MimeTypeHelper.java
+++ b/src/com/cyanogenmod/filemanager/util/MimeTypeHelper.java
@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.util;
+package com.cyanogenmod.filemanager.util;
 
 import android.content.Context;
 import android.content.res.Resources;
 import android.util.Log;
 
-import com.cyanogenmod.explorer.R;
-import com.cyanogenmod.explorer.model.BlockDevice;
-import com.cyanogenmod.explorer.model.CharacterDevice;
-import com.cyanogenmod.explorer.model.Directory;
-import com.cyanogenmod.explorer.model.DomainSocket;
-import com.cyanogenmod.explorer.model.FileSystemObject;
-import com.cyanogenmod.explorer.model.NamedPipe;
-import com.cyanogenmod.explorer.model.Symlink;
-import com.cyanogenmod.explorer.model.SystemFile;
+import com.cyanogenmod.filemanager.R;
+import com.cyanogenmod.filemanager.model.BlockDevice;
+import com.cyanogenmod.filemanager.model.CharacterDevice;
+import com.cyanogenmod.filemanager.model.Directory;
+import com.cyanogenmod.filemanager.model.DomainSocket;
+import com.cyanogenmod.filemanager.model.FileSystemObject;
+import com.cyanogenmod.filemanager.model.NamedPipe;
+import com.cyanogenmod.filemanager.model.Symlink;
+import com.cyanogenmod.filemanager.model.SystemFile;
 
 import java.io.File;
 import java.util.Enumeration;
diff --git a/src/com/cyanogenmod/explorer/util/MountPointHelper.java b/src/com/cyanogenmod/filemanager/util/MountPointHelper.java
index 6dd1872d..97036188 100644
--- a/src/com/cyanogenmod/explorer/util/MountPointHelper.java
+++ b/src/com/cyanogenmod/filemanager/util/MountPointHelper.java
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.cyanogenmod.explorer.util;
+package com.cyanogenmod.filemanager.util;
 
 import android.util.Log;
 
-import com.cyanogenmod.explorer.ExplorerApplication;
-import com.cyanogenmod.explorer.commands.MountExecutable;
-import com.cyanogenmod.explorer.console.Console;
-import com.cyanogenmod.explorer.model.DiskUsage;
-import com.cyanogenmod.explorer.model.FileSystemObject;
-import com.cyanogenmod.explorer.model.MountPoint;
+import com.cyanogenmod.filemanager.FileManagerApplication;
+import com.cyanogenmod.filemanager.commands.MountExecutable;
+import com.cyanogenmod.filemanager.console.Console;
+import com.cyanogenmod.filemanager.model.DiskUsage;
+import com.cyanogenmod.filemanager.model.FileSystemObject;
+import com.cyanogenmod.filemanager.model.MountPoint;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -70,7 +70,7 @@ public final class MountPointHelper {
      */
     public static MountPoint getMountPointFromDirectory(String dir) {
         try {
-            return getMountPointFromDirectory(ExplorerApplication.getBackgroundConsole(), dir);
+            return getMountPointFromDirectory(FileManagerApplication.getBackgroundConsole(), dir);
         } catch (Exception e) {
             Log.e(TAG, "Failed to retrieve mount point information.", e); //$NON-NLS-1$
         }
@@ -123,7 +123,7 @@ public final class MountPointHelper {
      * @return DiskUsage The disk usage information
      */
     public static DiskUsage getMountPointDiskUsage(MountPoint mp) {
-        return getMountPointDiskUsage(ExplorerApplication.getBackgroundConsole(), mp);
+        return getMountPointDiskUsage(FileManagerApplication.getBackgroundConsole(), mp);
     }
 
     /**
diff --git a/src/com/cyanogenmod/explorer/util/ParseHelper.java b/src/com/cyanogenmod/filemanager/util/ParseHelper.java
index f05ebba8..f59b9800 100644
--- a/src/com/cyanogenmod/explorer/util/ParseHelper.java
+++ b/src/com/cyanogenmod/filemanager/util/ParseHelper.java
@@ -14,27 +14,27 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.util;
+package com.cyanogenmod.filemanager.util;
 
 import android.os.Process;
 
-import com.cyanogenmod.explorer.model.BlockDevice;
-import com.cyanogenmod.explorer.model.CharacterDevice;
-import com.cyanogenmod.explorer.model.Directory;
-import com.cyanogenmod.explorer.model.DiskUsage;
-import com.cyanogenmod.explorer.model.DomainSocket;
-import com.cyanogenmod.explorer.model.FileSystemObject;
-import com.cyanogenmod.explorer.model.Group;
-import com.cyanogenmod.explorer.model.GroupPermission;
-import com.cyanogenmod.explorer.model.MountPoint;
-import com.cyanogenmod.explorer.model.NamedPipe;
-import com.cyanogenmod.explorer.model.OthersPermission;
-import com.cyanogenmod.explorer.model.Permission;
-import com.cyanogenmod.explorer.model.Permissions;
-import com.cyanogenmod.explorer.model.RegularFile;
-import com.cyanogenmod.explorer.model.Symlink;
-import com.cyanogenmod.explorer.model.User;
-import com.cyanogenmod.explorer.model.UserPermission;
+import com.cyanogenmod.filemanager.model.BlockDevice;
+import com.cyanogenmod.filemanager.model.CharacterDevice;
+import com.cyanogenmod.filemanager.model.Directory;
+import com.cyanogenmod.filemanager.model.DiskUsage;
+import com.cyanogenmod.filemanager.model.DomainSocket;
+import com.cyanogenmod.filemanager.model.FileSystemObject;
+import com.cyanogenmod.filemanager.model.Group;
+import com.cyanogenmod.filemanager.model.GroupPermission;
+import com.cyanogenmod.filemanager.model.MountPoint;
+import com.cyanogenmod.filemanager.model.NamedPipe;
+import com.cyanogenmod.filemanager.model.OthersPermission;
+import com.cyanogenmod.filemanager.model.Permission;
+import com.cyanogenmod.filemanager.model.Permissions;
+import com.cyanogenmod.filemanager.model.RegularFile;
+import com.cyanogenmod.filemanager.model.Symlink;
+import com.cyanogenmod.filemanager.model.User;
+import com.cyanogenmod.filemanager.model.UserPermission;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
diff --git a/src/com/cyanogenmod/explorer/util/ResourcesHelper.java b/src/com/cyanogenmod/filemanager/util/ResourcesHelper.java
index e51f07dc..e561c476 100644
--- a/src/com/cyanogenmod/explorer/util/ResourcesHelper.java
+++ b/src/com/cyanogenmod/filemanager/util/ResourcesHelper.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.util;
+package com.cyanogenmod.filemanager.util;
 
 import android.content.res.Resources;
 
-import com.cyanogenmod.explorer.R;
+import com.cyanogenmod.filemanager.R;
 
 import java.lang.reflect.Field;
 
diff --git a/src/com/cyanogenmod/explorer/util/SearchHelper.java b/src/com/cyanogenmod/filemanager/util/SearchHelper.java
index d46be07f..d6120759 100644
--- a/src/com/cyanogenmod/explorer/util/SearchHelper.java
+++ b/src/com/cyanogenmod/filemanager/util/SearchHelper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.util;
+package com.cyanogenmod.filemanager.util;
 
 import android.graphics.Color;
 import android.graphics.Typeface;
@@ -23,9 +23,9 @@ import android.text.Spannable;
 import android.text.style.BackgroundColorSpan;
 import android.text.style.StyleSpan;
 
-import com.cyanogenmod.explorer.model.FileSystemObject;
-import com.cyanogenmod.explorer.model.Query;
-import com.cyanogenmod.explorer.model.SearchResult;
+import com.cyanogenmod.filemanager.model.FileSystemObject;
+import com.cyanogenmod.filemanager.model.Query;
+import com.cyanogenmod.filemanager.model.SearchResult;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/cyanogenmod/explorer/util/SelectionHelper.java b/src/com/cyanogenmod/filemanager/util/SelectionHelper.java
index 48278b3c..3648c947 100644
--- a/src/com/cyanogenmod/explorer/util/SelectionHelper.java
+++ b/src/com/cyanogenmod/filemanager/util/SelectionHelper.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.util;
+package com.cyanogenmod.filemanager.util;
 
-import com.cyanogenmod.explorer.model.FileSystemObject;
+import com.cyanogenmod.filemanager.model.FileSystemObject;
 
 import java.util.List;
 
diff --git a/src/com/cyanogenmod/explorer/util/ShellHelper.java b/src/com/cyanogenmod/filemanager/util/ShellHelper.java
index 5a4938d8..4f1b92e2 100644
--- a/src/com/cyanogenmod/explorer/util/ShellHelper.java
+++ b/src/com/cyanogenmod/filemanager/util/ShellHelper.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.util;
+package com.cyanogenmod.filemanager.util;
 
-import com.cyanogenmod.explorer.commands.shell.Command;
+import com.cyanogenmod.filemanager.commands.shell.Command;
 
 /**
  * A helper class with useful methods for deal with linux shells.
diff --git a/src/com/cyanogenmod/explorer/util/StorageHelper.java b/src/com/cyanogenmod/filemanager/util/StorageHelper.java
index 587187e7..77d4d73c 100644
--- a/src/com/cyanogenmod/explorer/util/StorageHelper.java
+++ b/src/com/cyanogenmod/filemanager/util/StorageHelper.java
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.cyanogenmod.explorer.util;
+package com.cyanogenmod.filemanager.util;
 
 import android.content.Context;
 import android.os.Environment;
 import android.os.storage.StorageManager;
 import android.os.storage.StorageVolume;
 
-import com.cyanogenmod.explorer.ExplorerApplication;
-import com.cyanogenmod.explorer.R;
+import com.cyanogenmod.filemanager.FileManagerApplication;
+import com.cyanogenmod.filemanager.R;
 
 import java.io.File;
 import java.lang.reflect.Constructor;
@@ -128,7 +128,7 @@ public final class StorageHelper {
      */
     public static boolean isPathInStorageVolume(String path) {
         StorageVolume[] volumes =
-                getStorageVolumes(ExplorerApplication.getInstance().getApplicationContext());
+                getStorageVolumes(FileManagerApplication.getInstance().getApplicationContext());
         int cc = volumes.length;
         for (int i = 0; i < cc; i++) {
             StorageVolume vol = volumes[i];
@@ -147,7 +147,7 @@ public final class StorageHelper {
      */
     public static boolean isStorageVolume(String path) {
         StorageVolume[] volumes =
-                getStorageVolumes(ExplorerApplication.getInstance().getApplicationContext());
+                getStorageVolumes(FileManagerApplication.getInstance().getApplicationContext());
         int cc = volumes.length;
         for (int i = 0; i < cc; i++) {
             StorageVolume vol = volumes[i];
@@ -168,7 +168,7 @@ public final class StorageHelper {
      */
     public static String getChrootedPath(String path) {
         StorageVolume[] volumes =
-                getStorageVolumes(ExplorerApplication.getInstance().getApplicationContext());
+                getStorageVolumes(FileManagerApplication.getInstance().getApplicationContext());
         int cc = volumes.length;
         for (int i = 0; i < cc; i++) {
             StorageVolume vol = volumes[i];
diff --git a/tests/Android.mk b/tests/Android.mk
index 3957590e..59524336 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -25,13 +25,13 @@ LOCAL_JAVA_LIBRARIES := android.test.runner
 # Include all test java files.
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
-# Notice that we don't have to include the src files of CMExplorer because, by
-# running the tests using an instrumentation targeting CMExplorer, we
+# Notice that we don't have to include the src files of CMFileManager because, by
+# running the tests using an instrumentation targeting CMFileManager, we
 # automatically get all of its classes loaded into our environment.
 
-LOCAL_PACKAGE_NAME := CMExplorerTests
+LOCAL_PACKAGE_NAME := CMFileManagerTests
 
-LOCAL_INSTRUMENTATION_FOR := CMExplorer
+LOCAL_INSTRUMENTATION_FOR := CMFileManager
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index 1fd0d883..a94ff445 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="com.cyanogenmod.explorer.test">
+  package="com.cyanogenmod.filemanager.test">
 
-  <original-package android:name="com.cyanogenmod.explorer.test" />
+  <original-package android:name="com.cyanogenmod.filemanager.test" />
 
   <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="16" />
 
@@ -11,7 +11,7 @@
 
   <instrumentation
     android:name="android.test.InstrumentationTestRunner"
-    android:targetPackage="com.cyanogenmod.explorer" />
+    android:targetPackage="com.cyanogenmod.filemanager" />
 
   <application
     android:icon="@drawable/ic_launcher"
diff --git a/tests/proguard.flags b/tests/proguard.flags
index 3b363093..84565dce 100644
--- a/tests/proguard.flags
+++ b/tests/proguard.flags
@@ -45,6 +45,6 @@
 }
 
 #don't note test classes
--dontnote com.cyanogenmod.explorer.commands.**Test**
--dontnote com.cyanogenmod.explorer.console.**Test**
+-dontnote com.cyanogenmod.filemanager.commands.**Test**
+-dontnote com.cyanogenmod.filemanager.console.**Test**
 
diff --git a/tests/res/values/strings.xml b/tests/res/values/strings.xml
index a5237bcc..db17d98b 100644
--- a/tests/res/values/strings.xml
+++ b/tests/res/values/strings.xml
@@ -1,6 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+ ** Copyright (C) 2012 The CyanogenMod Project
+ **
+ ** Licensed under the Apache License, Version 2.0 (the "License");
+ ** you may not use this file except in compliance with the License.
+ ** You may obtain a copy of the License at
+ **
+ **      http://www.apache.org/licenses/LICENSE-2.0
+ **
+ ** Unless required by applicable law or agreed to in writing, software
+ ** distributed under the License is distributed on an "AS IS" BASIS,
+ ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ** See the License for the specific language governing permissions and
+ ** limitations under the License.
+-->
 <resources>
-
-  <string name="app_name">CMExplorerTest</string>
-
+  <string name="app_name">File Manager Tests</string>
 </resources>
\ No newline at end of file
diff --git a/tests/src/com/cyanogenmod/explorer/commands/shell/AbstractConsoleTest.java b/tests/src/com/cyanogenmod/filemanager/commands/shell/AbstractConsoleTest.java
index d5ead37e..fa1b0908 100644
--- a/tests/src/com/cyanogenmod/explorer/commands/shell/AbstractConsoleTest.java
+++ b/tests/src/com/cyanogenmod/filemanager/commands/shell/AbstractConsoleTest.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 
-import com.cyanogenmod.explorer.ExplorerApplication;
-import com.cyanogenmod.explorer.console.Console;
-import com.cyanogenmod.explorer.console.ConsoleBuilder;
-import com.cyanogenmod.explorer.console.shell.ShellConsole;
-import com.cyanogenmod.explorer.util.FileHelper;
+import com.cyanogenmod.filemanager.FileManagerApplication;
+import com.cyanogenmod.filemanager.console.Console;
+import com.cyanogenmod.filemanager.console.ConsoleBuilder;
+import com.cyanogenmod.filemanager.console.shell.ShellConsole;
+import com.cyanogenmod.filemanager.util.FileHelper;
 
 /**
  * An abstract class that manages tests that needs a console.
@@ -45,7 +45,7 @@ public abstract class AbstractConsoleTest extends android.test.AndroidTestCase {
     protected void setUp() throws Exception {
         //Setup the console
         if (isRootConsoleNeeded()) {
-            ExplorerApplication.changeBackgroundConsoleToPriviligedConsole();
+            FileManagerApplication.changeBackgroundConsoleToPriviligedConsole();
             this.mConsole = ConsoleBuilder.createPrivilegedConsole(getContext(), INITIAL_DIR);
         } else {
             this.mConsole = ConsoleBuilder.createNonPrivilegedConsole(getContext(), INITIAL_DIR);
diff --git a/tests/src/com/cyanogenmod/explorer/commands/shell/ChangeCurrentDirCommandTest.java b/tests/src/com/cyanogenmod/filemanager/commands/shell/ChangeCurrentDirCommandTest.java
index 99e3afa8..2ef12a47 100644
--- a/tests/src/com/cyanogenmod/explorer/commands/shell/ChangeCurrentDirCommandTest.java
+++ b/tests/src/com/cyanogenmod/filemanager/commands/shell/ChangeCurrentDirCommandTest.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 
 import android.test.suitebuilder.annotation.SmallTest;
 
-import com.cyanogenmod.explorer.console.NoSuchFileOrDirectory;
-import com.cyanogenmod.explorer.util.CommandHelper;
-import com.cyanogenmod.explorer.util.FileHelper;
+import com.cyanogenmod.filemanager.console.NoSuchFileOrDirectory;
+import com.cyanogenmod.filemanager.util.CommandHelper;
+import com.cyanogenmod.filemanager.util.FileHelper;
 
 /**
  * A class for testing the {@link ChangeCurrentDirCommand} command.
diff --git a/tests/src/com/cyanogenmod/explorer/commands/shell/ChangeOwnerCommandTest.java b/tests/src/com/cyanogenmod/filemanager/commands/shell/ChangeOwnerCommandTest.java
index ecab5627..b53a32da 100644
--- a/tests/src/com/cyanogenmod/explorer/commands/shell/ChangeOwnerCommandTest.java
+++ b/tests/src/com/cyanogenmod/filemanager/commands/shell/ChangeOwnerCommandTest.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 
 import android.os.Environment;
 import android.test.suitebuilder.annotation.SmallTest;
 
-import com.cyanogenmod.explorer.model.FileSystemObject;
-import com.cyanogenmod.explorer.model.Group;
-import com.cyanogenmod.explorer.model.User;
-import com.cyanogenmod.explorer.util.CommandHelper;
+import com.cyanogenmod.filemanager.model.FileSystemObject;
+import com.cyanogenmod.filemanager.model.Group;
+import com.cyanogenmod.filemanager.model.User;
+import com.cyanogenmod.filemanager.util.CommandHelper;
 
 /**
  * A class for testing the {@link ChangeOwnerCommand} command.
diff --git a/tests/src/com/cyanogenmod/explorer/commands/shell/ChangePermissionsCommandTest.java b/tests/src/com/cyanogenmod/filemanager/commands/shell/ChangePermissionsCommandTest.java
index b2af590b..e87e8b91 100644
--- a/tests/src/com/cyanogenmod/explorer/commands/shell/ChangePermissionsCommandTest.java
+++ b/tests/src/com/cyanogenmod/filemanager/commands/shell/ChangePermissionsCommandTest.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 
 import android.os.Environment;
 import android.test.suitebuilder.annotation.SmallTest;
 
-import com.cyanogenmod.explorer.model.FileSystemObject;
-import com.cyanogenmod.explorer.model.Permissions;
-import com.cyanogenmod.explorer.util.CommandHelper;
+import com.cyanogenmod.filemanager.model.FileSystemObject;
+import com.cyanogenmod.filemanager.model.Permissions;
+import com.cyanogenmod.filemanager.util.CommandHelper;
 
 /**
  * A class for testing the {@link ChangePermissionsCommand} command.
diff --git a/tests/src/com/cyanogenmod/explorer/commands/shell/CompressCommandTest.java b/tests/src/com/cyanogenmod/filemanager/commands/shell/CompressCommandTest.java
index 6a853832..2c02732e 100644
--- a/tests/src/com/cyanogenmod/explorer/commands/shell/CompressCommandTest.java
+++ b/tests/src/com/cyanogenmod/filemanager/commands/shell/CompressCommandTest.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 
 import android.os.Environment;
 import android.test.suitebuilder.annotation.LargeTest;
 import android.util.Log;
 
-import com.cyanogenmod.explorer.commands.AsyncResultListener;
-import com.cyanogenmod.explorer.commands.CompressExecutable;
-import com.cyanogenmod.explorer.preferences.CompressionMode;
-import com.cyanogenmod.explorer.util.CommandHelper;
+import com.cyanogenmod.filemanager.commands.AsyncResultListener;
+import com.cyanogenmod.filemanager.commands.CompressExecutable;
+import com.cyanogenmod.filemanager.preferences.CompressionMode;
+import com.cyanogenmod.filemanager.util.CommandHelper;
 
 /**
  * A class for testing the compression of file system objects.
diff --git a/tests/src/com/cyanogenmod/explorer/commands/shell/CopyCommandTest.java b/tests/src/com/cyanogenmod/filemanager/commands/shell/CopyCommandTest.java
index ede0b3e1..afe4f72a 100644
--- a/tests/src/com/cyanogenmod/explorer/commands/shell/CopyCommandTest.java
+++ b/tests/src/com/cyanogenmod/filemanager/commands/shell/CopyCommandTest.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 
 import android.os.Environment;
 import android.test.suitebuilder.annotation.SmallTest;
 
-import com.cyanogenmod.explorer.util.CommandHelper;
+import com.cyanogenmod.filemanager.util.CommandHelper;
 
 /**
  * A class for testing the {@link CopyCommand} command.
diff --git a/tests/src/com/cyanogenmod/explorer/commands/shell/CreateDirCommandTest.java b/tests/src/com/cyanogenmod/filemanager/commands/shell/CreateDirCommandTest.java
index 00e9abea..ad4c70ca 100644
--- a/tests/src/com/cyanogenmod/explorer/commands/shell/CreateDirCommandTest.java
+++ b/tests/src/com/cyanogenmod/filemanager/commands/shell/CreateDirCommandTest.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 
 import android.os.Environment;
 import android.test.suitebuilder.annotation.SmallTest;
 
-import com.cyanogenmod.explorer.console.NoSuchFileOrDirectory;
-import com.cyanogenmod.explorer.util.CommandHelper;
+import com.cyanogenmod.filemanager.console.NoSuchFileOrDirectory;
+import com.cyanogenmod.filemanager.util.CommandHelper;
 
 /**
  * A class for testing the {@link CreateDirCommand} command.
diff --git a/tests/src/com/cyanogenmod/explorer/commands/shell/CreateFileCommandTest.java b/tests/src/com/cyanogenmod/filemanager/commands/shell/CreateFileCommandTest.java
index 192a40d2..ba1879b5 100644
--- a/tests/src/com/cyanogenmod/explorer/commands/shell/CreateFileCommandTest.java
+++ b/tests/src/com/cyanogenmod/filemanager/commands/shell/CreateFileCommandTest.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 
 import android.os.Environment;
 import android.test.suitebuilder.annotation.SmallTest;
 
-import com.cyanogenmod.explorer.console.NoSuchFileOrDirectory;
-import com.cyanogenmod.explorer.util.CommandHelper;
+import com.cyanogenmod.filemanager.console.NoSuchFileOrDirectory;
+import com.cyanogenmod.filemanager.util.CommandHelper;
 
 /**
  * A class for testing the {@link CreateFileCommand} command.
diff --git a/tests/src/com/cyanogenmod/explorer/commands/shell/CurrentDirCommandTest.java b/tests/src/com/cyanogenmod/filemanager/commands/shell/CurrentDirCommandTest.java
index 1e201992..5cd5f3ba 100644
--- a/tests/src/com/cyanogenmod/explorer/commands/shell/CurrentDirCommandTest.java
+++ b/tests/src/com/cyanogenmod/filemanager/commands/shell/CurrentDirCommandTest.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 
 import android.os.Environment;
 import android.test.suitebuilder.annotation.SmallTest;
 
-import com.cyanogenmod.explorer.util.CommandHelper;
+import com.cyanogenmod.filemanager.util.CommandHelper;
 
 /**
  * A class for testing the {@link CurrentDirCommand} command.
diff --git a/tests/src/com/cyanogenmod/explorer/commands/shell/DeleteDirCommandTest.java b/tests/src/com/cyanogenmod/filemanager/commands/shell/DeleteDirCommandTest.java
index 816b4e16..046c0136 100644
--- a/tests/src/com/cyanogenmod/explorer/commands/shell/DeleteDirCommandTest.java
+++ b/tests/src/com/cyanogenmod/filemanager/commands/shell/DeleteDirCommandTest.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 
 import android.os.Environment;
 import android.test.suitebuilder.annotation.SmallTest;
 
-import com.cyanogenmod.explorer.console.NoSuchFileOrDirectory;
-import com.cyanogenmod.explorer.util.CommandHelper;
+import com.cyanogenmod.filemanager.console.NoSuchFileOrDirectory;
+import com.cyanogenmod.filemanager.util.CommandHelper;
 
 /**
  * A class for testing the {@link DeleteDirCommand} command.
diff --git a/tests/src/com/cyanogenmod/explorer/commands/shell/DeleteFileCommandTest.java b/tests/src/com/cyanogenmod/filemanager/commands/shell/DeleteFileCommandTest.java
index 2783fd87..4b8e7b51 100644
--- a/tests/src/com/cyanogenmod/explorer/commands/shell/DeleteFileCommandTest.java
+++ b/tests/src/com/cyanogenmod/filemanager/commands/shell/DeleteFileCommandTest.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 
 import android.os.Environment;
 import android.test.suitebuilder.annotation.SmallTest;
 
-import com.cyanogenmod.explorer.console.NoSuchFileOrDirectory;
-import com.cyanogenmod.explorer.util.CommandHelper;
+import com.cyanogenmod.filemanager.console.NoSuchFileOrDirectory;
+import com.cyanogenmod.filemanager.util.CommandHelper;
 
 /**
  * A class for testing the {@link DeleteFileCommand} command.
diff --git a/tests/src/com/cyanogenmod/explorer/commands/shell/DiskUsageCommandTest.java b/tests/src/com/cyanogenmod/filemanager/commands/shell/DiskUsageCommandTest.java
index db4b5d46..5fff3741 100644
--- a/tests/src/com/cyanogenmod/explorer/commands/shell/DiskUsageCommandTest.java
+++ b/tests/src/com/cyanogenmod/filemanager/commands/shell/DiskUsageCommandTest.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 
 import java.util.List;
 
 import android.test.suitebuilder.annotation.SmallTest;
 
-import com.cyanogenmod.explorer.model.DiskUsage;
-import com.cyanogenmod.explorer.util.CommandHelper;
+import com.cyanogenmod.filemanager.model.DiskUsage;
+import com.cyanogenmod.filemanager.util.CommandHelper;
 
 /**
  * A class for testing the {@link DiskUsageCommand} command.
diff --git a/tests/src/com/cyanogenmod/explorer/commands/shell/EchoCommandTest.java b/tests/src/com/cyanogenmod/filemanager/commands/shell/EchoCommandTest.java
index cf3f118e..3b8fb3b3 100644
--- a/tests/src/com/cyanogenmod/explorer/commands/shell/EchoCommandTest.java
+++ b/tests/src/com/cyanogenmod/filemanager/commands/shell/EchoCommandTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 
 import android.test.suitebuilder.annotation.SmallTest;
 
-import com.cyanogenmod.explorer.util.CommandHelper;
+import com.cyanogenmod.filemanager.util.CommandHelper;
 
 /**
  * A class for testing the method for retrieve the value of a variable.
diff --git a/tests/src/com/cyanogenmod/explorer/commands/shell/ExecCommandTest.java b/tests/src/com/cyanogenmod/filemanager/commands/shell/ExecCommandTest.java
index 99b1e849..7cfd0964 100644
--- a/tests/src/com/cyanogenmod/explorer/commands/shell/ExecCommandTest.java
+++ b/tests/src/com/cyanogenmod/filemanager/commands/shell/ExecCommandTest.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 
 import java.io.OutputStream;
 
 import android.os.Environment;
 import android.test.suitebuilder.annotation.MediumTest;
 
-import com.cyanogenmod.explorer.commands.AsyncResultListener;
-import com.cyanogenmod.explorer.commands.WriteExecutable;
-import com.cyanogenmod.explorer.model.Permissions;
-import com.cyanogenmod.explorer.util.CommandHelper;
+import com.cyanogenmod.filemanager.commands.AsyncResultListener;
+import com.cyanogenmod.filemanager.commands.WriteExecutable;
+import com.cyanogenmod.filemanager.model.Permissions;
+import com.cyanogenmod.filemanager.util.CommandHelper;
 
 /**
  * A class for testing exec command.
diff --git a/tests/src/com/cyanogenmod/explorer/commands/shell/FindCommandTest.java b/tests/src/com/cyanogenmod/filemanager/commands/shell/FindCommandTest.java
index efe0408c..46ce9daa 100644
--- a/tests/src/com/cyanogenmod/explorer/commands/shell/FindCommandTest.java
+++ b/tests/src/com/cyanogenmod/filemanager/commands/shell/FindCommandTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -22,11 +22,11 @@ import java.util.List;
 import android.os.Environment;
 import android.test.suitebuilder.annotation.LargeTest;
 
-import com.cyanogenmod.explorer.commands.AsyncResultExecutable;
-import com.cyanogenmod.explorer.commands.AsyncResultListener;
-import com.cyanogenmod.explorer.model.FileSystemObject;
-import com.cyanogenmod.explorer.model.Query;
-import com.cyanogenmod.explorer.util.CommandHelper;
+import com.cyanogenmod.filemanager.commands.AsyncResultExecutable;
+import com.cyanogenmod.filemanager.commands.AsyncResultListener;
+import com.cyanogenmod.filemanager.model.FileSystemObject;
+import com.cyanogenmod.filemanager.model.Query;
+import com.cyanogenmod.filemanager.util.CommandHelper;
 
 /**
  * A class for testing find command.
diff --git a/tests/src/com/cyanogenmod/explorer/commands/shell/FolderUsageCommandTest.java b/tests/src/com/cyanogenmod/filemanager/commands/shell/FolderUsageCommandTest.java
index 83af93a2..6a9b0ed7 100644
--- a/tests/src/com/cyanogenmod/explorer/commands/shell/FolderUsageCommandTest.java
+++ b/tests/src/com/cyanogenmod/filemanager/commands/shell/FolderUsageCommandTest.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 
 import android.os.Environment;
 import android.test.suitebuilder.annotation.LargeTest;
 import android.util.Log;
 
-import com.cyanogenmod.explorer.commands.AsyncResultExecutable;
-import com.cyanogenmod.explorer.commands.AsyncResultListener;
-import com.cyanogenmod.explorer.model.FolderUsage;
-import com.cyanogenmod.explorer.util.CommandHelper;
-import com.cyanogenmod.explorer.util.MimeTypeHelper.MimeTypeCategory;
+import com.cyanogenmod.filemanager.commands.AsyncResultExecutable;
+import com.cyanogenmod.filemanager.commands.AsyncResultListener;
+import com.cyanogenmod.filemanager.model.FolderUsage;
+import com.cyanogenmod.filemanager.util.CommandHelper;
+import com.cyanogenmod.filemanager.util.MimeTypeHelper.MimeTypeCategory;
 
 /**
  * A class for testing folder usage command.
diff --git a/tests/src/com/cyanogenmod/explorer/commands/shell/GroupsCommandTest.java b/tests/src/com/cyanogenmod/filemanager/commands/shell/GroupsCommandTest.java
index e5982eab..c7b7321a 100644
--- a/tests/src/com/cyanogenmod/explorer/commands/shell/GroupsCommandTest.java
+++ b/tests/src/com/cyanogenmod/filemanager/commands/shell/GroupsCommandTest.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 
 import java.util.List;
 
 import android.test.suitebuilder.annotation.SmallTest;
 
-import com.cyanogenmod.explorer.model.Group;
-import com.cyanogenmod.explorer.util.CommandHelper;
+import com.cyanogenmod.filemanager.model.Group;
+import com.cyanogenmod.filemanager.util.CommandHelper;
 
 /**
  * A class for testing the {@link GroupsCommand} command.
diff --git a/tests/src/com/cyanogenmod/explorer/commands/shell/IdentityCommandTest.java b/tests/src/com/cyanogenmod/filemanager/commands/shell/IdentityCommandTest.java
index 857fe9c0..728a1fbd 100644
--- a/tests/src/com/cyanogenmod/explorer/commands/shell/IdentityCommandTest.java
+++ b/tests/src/com/cyanogenmod/filemanager/commands/shell/IdentityCommandTest.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 
 import android.test.suitebuilder.annotation.SmallTest;
 
-import com.cyanogenmod.explorer.model.Identity;
-import com.cyanogenmod.explorer.util.CommandHelper;
+import com.cyanogenmod.filemanager.model.Identity;
+import com.cyanogenmod.filemanager.util.CommandHelper;
 
 /**
  * A class for testing the {@link IdentityCommand} command.
diff --git a/tests/src/com/cyanogenmod/explorer/commands/shell/LinkCommandTest.java b/tests/src/com/cyanogenmod/filemanager/commands/shell/LinkCommandTest.java
index cf7e8a63..2fbe590a 100644
--- a/tests/src/com/cyanogenmod/explorer/commands/shell/LinkCommandTest.java
+++ b/tests/src/com/cyanogenmod/filemanager/commands/shell/LinkCommandTest.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 
 import android.os.Environment;
 import android.test.suitebuilder.annotation.SmallTest;
 
-import com.cyanogenmod.explorer.console.InsufficientPermissionsException;
-import com.cyanogenmod.explorer.model.FileSystemObject;
-import com.cyanogenmod.explorer.model.Symlink;
-import com.cyanogenmod.explorer.util.CommandHelper;
+import com.cyanogenmod.filemanager.console.InsufficientPermissionsException;
+import com.cyanogenmod.filemanager.model.FileSystemObject;
+import com.cyanogenmod.filemanager.model.Symlink;
+import com.cyanogenmod.filemanager.util.CommandHelper;
 
 /**
  * A class for testing the {@link LinkCommandTest} command.
diff --git a/tests/src/com/cyanogenmod/explorer/commands/shell/ListCommandTest.java b/tests/src/com/cyanogenmod/filemanager/commands/shell/ListCommandTest.java
index 99f2406d..5fcc8bc1 100644
--- a/tests/src/com/cyanogenmod/explorer/commands/shell/ListCommandTest.java
+++ b/tests/src/com/cyanogenmod/filemanager/commands/shell/ListCommandTest.java
@@ -14,23 +14,23 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 
 import java.util.List;
 
 import android.test.suitebuilder.annotation.MediumTest;
 import android.test.suitebuilder.annotation.SmallTest;
 
-import com.cyanogenmod.explorer.model.BlockDevice;
-import com.cyanogenmod.explorer.model.CharacterDevice;
-import com.cyanogenmod.explorer.model.Directory;
-import com.cyanogenmod.explorer.model.DomainSocket;
-import com.cyanogenmod.explorer.model.FileSystemObject;
-import com.cyanogenmod.explorer.model.NamedPipe;
-import com.cyanogenmod.explorer.model.RegularFile;
-import com.cyanogenmod.explorer.model.Symlink;
-import com.cyanogenmod.explorer.util.CommandHelper;
-import com.cyanogenmod.explorer.util.FileHelper;
+import com.cyanogenmod.filemanager.model.BlockDevice;
+import com.cyanogenmod.filemanager.model.CharacterDevice;
+import com.cyanogenmod.filemanager.model.Directory;
+import com.cyanogenmod.filemanager.model.DomainSocket;
+import com.cyanogenmod.filemanager.model.FileSystemObject;
+import com.cyanogenmod.filemanager.model.NamedPipe;
+import com.cyanogenmod.filemanager.model.RegularFile;
+import com.cyanogenmod.filemanager.model.Symlink;
+import com.cyanogenmod.filemanager.util.CommandHelper;
+import com.cyanogenmod.filemanager.util.FileHelper;
 
 /**
  * A class for testing list command.
diff --git a/tests/src/com/cyanogenmod/explorer/commands/shell/MountCommandTest.java b/tests/src/com/cyanogenmod/filemanager/commands/shell/MountCommandTest.java
index 48465e0d..e851b6a8 100644
--- a/tests/src/com/cyanogenmod/explorer/commands/shell/MountCommandTest.java
+++ b/tests/src/com/cyanogenmod/filemanager/commands/shell/MountCommandTest.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 
 import android.test.suitebuilder.annotation.MediumTest;
 
-import com.cyanogenmod.explorer.model.MountPoint;
-import com.cyanogenmod.explorer.util.CommandHelper;
-import com.cyanogenmod.explorer.util.MountPointHelper;
+import com.cyanogenmod.filemanager.model.MountPoint;
+import com.cyanogenmod.filemanager.util.CommandHelper;
+import com.cyanogenmod.filemanager.util.MountPointHelper;
 
 /**
  * A class for testing the {@link MountCommand} command.
diff --git a/tests/src/com/cyanogenmod/explorer/commands/shell/MountPointInfoCommandTest.java b/tests/src/com/cyanogenmod/filemanager/commands/shell/MountPointInfoCommandTest.java
index 674ad2a9..23c5e8c5 100644
--- a/tests/src/com/cyanogenmod/explorer/commands/shell/MountPointInfoCommandTest.java
+++ b/tests/src/com/cyanogenmod/filemanager/commands/shell/MountPointInfoCommandTest.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 
 import java.util.List;
 
 import android.test.suitebuilder.annotation.SmallTest;
 
-import com.cyanogenmod.explorer.model.MountPoint;
-import com.cyanogenmod.explorer.util.CommandHelper;
+import com.cyanogenmod.filemanager.model.MountPoint;
+import com.cyanogenmod.filemanager.util.CommandHelper;
 
 /**
  * A class for testing the {@link MountPointInfoCommand} command.
diff --git a/tests/src/com/cyanogenmod/explorer/commands/shell/MoveCommandTest.java b/tests/src/com/cyanogenmod/filemanager/commands/shell/MoveCommandTest.java
index 5bb5621e..61470ab0 100644
--- a/tests/src/com/cyanogenmod/explorer/commands/shell/MoveCommandTest.java
+++ b/tests/src/com/cyanogenmod/filemanager/commands/shell/MoveCommandTest.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 
 import android.os.Environment;
 import android.test.suitebuilder.annotation.SmallTest;
 
-import com.cyanogenmod.explorer.util.CommandHelper;
+import com.cyanogenmod.filemanager.util.CommandHelper;
 
 /**
  * A class for testing the {@link MoveCommand} command.
diff --git a/tests/src/com/cyanogenmod/explorer/commands/shell/ParentDirCommandTest.java b/tests/src/com/cyanogenmod/filemanager/commands/shell/ParentDirCommandTest.java
index 9717e7e4..be9467a8 100644
--- a/tests/src/com/cyanogenmod/explorer/commands/shell/ParentDirCommandTest.java
+++ b/tests/src/com/cyanogenmod/filemanager/commands/shell/ParentDirCommandTest.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 
 import android.os.Environment;
 import android.test.suitebuilder.annotation.SmallTest;
 
-import com.cyanogenmod.explorer.util.CommandHelper;
+import com.cyanogenmod.filemanager.util.CommandHelper;
 
 /**
  * A class for testing the method for retrieve the value of a variable.
diff --git a/tests/src/com/cyanogenmod/explorer/commands/shell/ProcessIdCommandTest.java b/tests/src/com/cyanogenmod/filemanager/commands/shell/ProcessIdCommandTest.java
index dc18b594..f491d808 100644
--- a/tests/src/com/cyanogenmod/explorer/commands/shell/ProcessIdCommandTest.java
+++ b/tests/src/com/cyanogenmod/filemanager/commands/shell/ProcessIdCommandTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 /**
  * A class for testing the {@link ProcessIdCommand} command.
  *
diff --git a/tests/src/com/cyanogenmod/explorer/commands/shell/QuickFolderSearchCommandTest.java b/tests/src/com/cyanogenmod/filemanager/commands/shell/QuickFolderSearchCommandTest.java
index 14e3f01c..53596fe8 100644
--- a/tests/src/com/cyanogenmod/explorer/commands/shell/QuickFolderSearchCommandTest.java
+++ b/tests/src/com/cyanogenmod/filemanager/commands/shell/QuickFolderSearchCommandTest.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 
 import java.util.List;
 
 import android.os.Environment;
 import android.test.suitebuilder.annotation.LargeTest;
 
-import com.cyanogenmod.explorer.util.CommandHelper;
+import com.cyanogenmod.filemanager.util.CommandHelper;
 
 /**
  * A class for testing the method for retrieve the value of a variable.
diff --git a/tests/src/com/cyanogenmod/explorer/commands/shell/ReadCommandTest.java b/tests/src/com/cyanogenmod/filemanager/commands/shell/ReadCommandTest.java
index 129f8645..b0625dbd 100644
--- a/tests/src/com/cyanogenmod/explorer/commands/shell/ReadCommandTest.java
+++ b/tests/src/com/cyanogenmod/filemanager/commands/shell/ReadCommandTest.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 
 import android.test.suitebuilder.annotation.MediumTest;
 import android.util.Log;
 
-import com.cyanogenmod.explorer.commands.AsyncResultExecutable;
-import com.cyanogenmod.explorer.commands.AsyncResultListener;
-import com.cyanogenmod.explorer.util.CommandHelper;
+import com.cyanogenmod.filemanager.commands.AsyncResultExecutable;
+import com.cyanogenmod.filemanager.commands.AsyncResultListener;
+import com.cyanogenmod.filemanager.util.CommandHelper;
 
 /**
  * A class for testing read command.
diff --git a/tests/src/com/cyanogenmod/explorer/commands/shell/ResolveLinkCommandTest.java b/tests/src/com/cyanogenmod/filemanager/commands/shell/ResolveLinkCommandTest.java
index e0685c8f..e1565f96 100644
--- a/tests/src/com/cyanogenmod/explorer/commands/shell/ResolveLinkCommandTest.java
+++ b/tests/src/com/cyanogenmod/filemanager/commands/shell/ResolveLinkCommandTest.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 
 import android.test.suitebuilder.annotation.SmallTest;
 
-import com.cyanogenmod.explorer.model.FileSystemObject;
-import com.cyanogenmod.explorer.util.CommandHelper;
+import com.cyanogenmod.filemanager.model.FileSystemObject;
+import com.cyanogenmod.filemanager.util.CommandHelper;
 
 /**
  * A class for testing the method for retrieve the value of a variable.
diff --git a/tests/src/com/cyanogenmod/explorer/commands/shell/SendSignalCommandTest.java b/tests/src/com/cyanogenmod/filemanager/commands/shell/SendSignalCommandTest.java
index 81109009..c4a7bd95 100644
--- a/tests/src/com/cyanogenmod/explorer/commands/shell/SendSignalCommandTest.java
+++ b/tests/src/com/cyanogenmod/filemanager/commands/shell/SendSignalCommandTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 /**
  * A class for testing the {@link SendSignalCommand} command.
  *
diff --git a/tests/src/com/cyanogenmod/explorer/commands/shell/UncompressCommandTest.java b/tests/src/com/cyanogenmod/filemanager/commands/shell/UncompressCommandTest.java
index 2c37594a..6fbfb3aa 100644
--- a/tests/src/com/cyanogenmod/explorer/commands/shell/UncompressCommandTest.java
+++ b/tests/src/com/cyanogenmod/filemanager/commands/shell/UncompressCommandTest.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 
 import android.test.suitebuilder.annotation.LargeTest;
 import android.util.Log;
 
-import com.cyanogenmod.explorer.commands.AsyncResultListener;
-import com.cyanogenmod.explorer.commands.UncompressExecutable;
-import com.cyanogenmod.explorer.util.CommandHelper;
+import com.cyanogenmod.filemanager.commands.AsyncResultListener;
+import com.cyanogenmod.filemanager.commands.UncompressExecutable;
+import com.cyanogenmod.filemanager.util.CommandHelper;
 
 /**
  * A class for testing the uncompression of file system objects.
diff --git a/tests/src/com/cyanogenmod/explorer/commands/shell/WriteCommandTest.java b/tests/src/com/cyanogenmod/filemanager/commands/shell/WriteCommandTest.java
index 73432871..2e14a993 100644
--- a/tests/src/com/cyanogenmod/explorer/commands/shell/WriteCommandTest.java
+++ b/tests/src/com/cyanogenmod/filemanager/commands/shell/WriteCommandTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.commands.shell;
+package com.cyanogenmod.filemanager.commands.shell;
 
 import java.io.OutputStream;
 import java.util.Random;
@@ -23,9 +23,9 @@ import android.os.Environment;
 import android.test.suitebuilder.annotation.LargeTest;
 import android.test.suitebuilder.annotation.SmallTest;
 
-import com.cyanogenmod.explorer.commands.AsyncResultListener;
-import com.cyanogenmod.explorer.commands.WriteExecutable;
-import com.cyanogenmod.explorer.util.CommandHelper;
+import com.cyanogenmod.filemanager.commands.AsyncResultListener;
+import com.cyanogenmod.filemanager.commands.WriteExecutable;
+import com.cyanogenmod.filemanager.util.CommandHelper;
 
 /**
  * A class for testing write command.
diff --git a/tests/src/com/cyanogenmod/explorer/console/ConsoleBuilderTest.java b/tests/src/com/cyanogenmod/filemanager/console/ConsoleBuilderTest.java
index 2b5d1242..7d163095 100644
--- a/tests/src/com/cyanogenmod/explorer/console/ConsoleBuilderTest.java
+++ b/tests/src/com/cyanogenmod/filemanager/console/ConsoleBuilderTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.explorer.console;
+package com.cyanogenmod.filemanager.console;
 
 import android.os.Environment;
 import android.test.suitebuilder.annotation.SmallTest;