diff --git a/AndorsTrail/AndroidManifest.xml b/AndorsTrail/AndroidManifest.xml
index 1ccdb1b38..f9669f497 100644
--- a/AndorsTrail/AndroidManifest.xml
+++ b/AndorsTrail/AndroidManifest.xml
@@ -2,9 +2,9 @@
 
 <manifest 
 	xmlns:android="http://schemas.android.com/apk/res/android" 
-	package="com.gpl.rpg.AndorsTrail_beta1"
+	package="com.gpl.rpg.AndorsTrail"
 	android:versionCode="64"
-	android:versionName="0.7.17beta"
+	android:versionName="0.7.17"
 	android:installLocation="auto"
 	>
 	<uses-sdk 
@@ -22,11 +22,10 @@
 	
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-	<uses-permission android:name="android.permission.READ_LOGS"/>
 
 
 	<application 
-		android:name="com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication"
+		android:name="com.gpl.rpg.AndorsTrail.AndorsTrailApplication"
 		android:label="@string/app_name" 
 		android:icon="@drawable/icon"
 		android:description="@string/app_description"
@@ -35,10 +34,9 @@
 		android:requestLegacyExternalStorage="true"
 		android:hasFragileUserData="true"
 		android:preserveLegacyExternalStorage="true"
-		android:debuggable="true"
 		>
 		<activity 
-		    android:name="com.gpl.rpg.AndorsTrail_beta1.activity.StartScreenActivity"
+		    android:name="com.gpl.rpg.AndorsTrail.activity.StartScreenActivity"
 		    android:clearTaskOnLaunch="true"
 		    >
 			<intent-filter>
@@ -47,29 +45,29 @@
 			</intent-filter>
 		</activity>
    		<activity 
-			android:name="com.gpl.rpg.AndorsTrail_beta1.activity.MainActivity"
+			android:name="com.gpl.rpg.AndorsTrail.activity.MainActivity"
 			android:label="@string/app_name" 
 			android:theme="@style/AndorsTrailTheme_Blue.NoBackground"
 			/>
-		<activity android:name="com.gpl.rpg.AndorsTrail_beta1.activity.HeroinfoActivity" />
-		<activity android:name="com.gpl.rpg.AndorsTrail_beta1.activity.MonsterInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
-		<activity android:name="com.gpl.rpg.AndorsTrail_beta1.activity.ItemInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
-		<activity android:name="com.gpl.rpg.AndorsTrail_beta1.activity.LevelUpActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
-		<activity android:name="com.gpl.rpg.AndorsTrail_beta1.activity.MonsterEncounterActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
-		<activity android:name="com.gpl.rpg.AndorsTrail_beta1.activity.ConversationActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
-		<activity android:name="com.gpl.rpg.AndorsTrail_beta1.activity.ShopActivity" />
-		<activity android:name="com.gpl.rpg.AndorsTrail_beta1.activity.AboutActivity" />
-		<activity android:name="com.gpl.rpg.AndorsTrail_beta1.activity.LoadingActivity" />
-		<activity android:name="com.gpl.rpg.AndorsTrail_beta1.activity.Preferences" />
-		<activity android:name="com.gpl.rpg.AndorsTrail_beta1.activity.LoadSaveActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
-		<activity android:name="com.gpl.rpg.AndorsTrail_beta1.activity.ActorConditionInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
-		<activity android:name="com.gpl.rpg.AndorsTrail_beta1.activity.BulkSelectionInterface" android:theme="@style/AndorsTrailDialogTheme_Blue" />
-		<activity android:name="com.gpl.rpg.AndorsTrail_beta1.activity.SkillInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
-		<activity android:name="com.gpl.rpg.AndorsTrail_beta1.activity.DisplayWorldMapActivity" />
+		<activity android:name="com.gpl.rpg.AndorsTrail.activity.HeroinfoActivity" />
+		<activity android:name="com.gpl.rpg.AndorsTrail.activity.MonsterInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name="com.gpl.rpg.AndorsTrail.activity.ItemInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name="com.gpl.rpg.AndorsTrail.activity.LevelUpActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name="com.gpl.rpg.AndorsTrail.activity.MonsterEncounterActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name="com.gpl.rpg.AndorsTrail.activity.ConversationActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name="com.gpl.rpg.AndorsTrail.activity.ShopActivity" />
+		<activity android:name="com.gpl.rpg.AndorsTrail.activity.AboutActivity" />
+		<activity android:name="com.gpl.rpg.AndorsTrail.activity.LoadingActivity" />
+		<activity android:name="com.gpl.rpg.AndorsTrail.activity.Preferences" />
+		<activity android:name="com.gpl.rpg.AndorsTrail.activity.LoadSaveActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name="com.gpl.rpg.AndorsTrail.activity.ActorConditionInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name="com.gpl.rpg.AndorsTrail.activity.BulkSelectionInterface" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name="com.gpl.rpg.AndorsTrail.activity.SkillInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name="com.gpl.rpg.AndorsTrail.activity.DisplayWorldMapActivity" />
 
         <provider
         android:name="android.support.v4.content.FileProvider"
-        android:authorities="com.gpl.rpg.AndorsTrail_beta1.fileprovider"
+        android:authorities="com.gpl.rpg.AndorsTrail.fileprovider"
         android:grantUriPermissions="true"
         android:exported="false">
         <meta-data
diff --git a/AndorsTrail/res/drawable/ui_blue_buttonbar_frame.xml b/AndorsTrail/res/drawable/ui_blue_buttonbar_frame.xml
index 757e55fe2..e3094c5e8 100644
--- a/AndorsTrail/res/drawable/ui_blue_buttonbar_frame.xml
+++ b/AndorsTrail/res/drawable/ui_blue_buttonbar_frame.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res/com.gpl.rpg.AndorsTrail_beta1" >
+    xmlns:app="http://schemas.android.com/apk/res/com.gpl.rpg.AndorsTrail" >
     
     <item app:single="true" android:drawable="@drawable/ui_blue_buttonbar_frame_solo" />
     
diff --git a/AndorsTrail/res/drawable/ui_charcoal_buttonbar_frame.xml b/AndorsTrail/res/drawable/ui_charcoal_buttonbar_frame.xml
index 04278aa1f..da65cfaf5 100644
--- a/AndorsTrail/res/drawable/ui_charcoal_buttonbar_frame.xml
+++ b/AndorsTrail/res/drawable/ui_charcoal_buttonbar_frame.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res/com.gpl.rpg.AndorsTrail_beta1" >
+    xmlns:app="http://schemas.android.com/apk/res/com.gpl.rpg.AndorsTrail" >
     
     <item app:single="true" android:drawable="@drawable/ui_charcoal_buttonbar_frame_solo" />
     
diff --git a/AndorsTrail/res/drawable/ui_green_buttonbar_frame.xml b/AndorsTrail/res/drawable/ui_green_buttonbar_frame.xml
index ed1aaa50c..4ccb45caa 100644
--- a/AndorsTrail/res/drawable/ui_green_buttonbar_frame.xml
+++ b/AndorsTrail/res/drawable/ui_green_buttonbar_frame.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res/com.gpl.rpg.AndorsTrail_beta1" >
+    xmlns:app="http://schemas.android.com/apk/res/com.gpl.rpg.AndorsTrail" >
     
     <item app:single="true" android:drawable="@drawable/ui_green_buttonbar_frame_solo" />
     
diff --git a/AndorsTrail/res/layout-land/title_bg_layout.xml b/AndorsTrail/res/layout-land/title_bg_layout.xml
index ce0d3c782..47cab4de3 100644
--- a/AndorsTrail/res/layout-land/title_bg_layout.xml
+++ b/AndorsTrail/res/layout-land/title_bg_layout.xml
@@ -6,7 +6,7 @@
 
     <include layout="@layout/title_bg_sky_layout"/>
 
-	<com.gpl.rpg.AndorsTrail_beta1.view.CloudsAnimatorView
+	<com.gpl.rpg.AndorsTrail.view.CloudsAnimatorView
         android:id="@+id/ts_clouds_animator_back"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
@@ -19,7 +19,7 @@
         android:scaleType="fitEnd"
         android:src="@drawable/ts_background"/>
     
-    <com.gpl.rpg.AndorsTrail_beta1.view.CloudsAnimatorView
+    <com.gpl.rpg.AndorsTrail.view.CloudsAnimatorView
         android:id="@+id/ts_clouds_animator_mid"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
@@ -32,7 +32,7 @@
         android:scaleType="fitEnd"
         android:src="@drawable/ts_midground"/>
      
-    <com.gpl.rpg.AndorsTrail_beta1.view.CloudsAnimatorView
+    <com.gpl.rpg.AndorsTrail.view.CloudsAnimatorView
         android:id="@+id/ts_clouds_animator_front"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
diff --git a/AndorsTrail/res/layout/actorconditioninfo.xml b/AndorsTrail/res/layout/actorconditioninfo.xml
index e95042af5..55ec9a0af 100644
--- a/AndorsTrail/res/layout/actorconditioninfo.xml
+++ b/AndorsTrail/res/layout/actorconditioninfo.xml
@@ -37,7 +37,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/actorconditioninfo_constant_effect" />
 
-            <com.gpl.rpg.AndorsTrail_beta1.view.AbilityModifierInfoView
+            <com.gpl.rpg.AndorsTrail.view.AbilityModifierInfoView
                 android:id="@+id/actorconditioninfo_constant_effect_abilitymodifierinfo"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/AndorsTrail/res/layout/combatview.xml b/AndorsTrail/res/layout/combatview.xml
index 39cb16664..19b0ea04d 100644
--- a/AndorsTrail/res/layout/combatview.xml
+++ b/AndorsTrail/res/layout/combatview.xml
@@ -29,7 +29,7 @@
                 android:text="@string/combat_attack"
                 android:textSize="@dimen/actionbar_text" />
 
-            <com.gpl.rpg.AndorsTrail_beta1.view.RangeBar
+            <com.gpl.rpg.AndorsTrail.view.RangeBar
                 android:id="@+id/combatview_status"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -107,7 +107,7 @@
                 android:padding="8dp"
                 android:scaleType="fitCenter" />
 
-            <com.gpl.rpg.AndorsTrail_beta1.view.RangeBar
+            <com.gpl.rpg.AndorsTrail.view.RangeBar
                 android:id="@+id/combatview_monsterhealth"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/AndorsTrail/res/layout/custom_checkedlistitem_layout.xml b/AndorsTrail/res/layout/custom_checkedlistitem_layout.xml
index 0ccf3b921..f785b3fc7 100644
--- a/AndorsTrail/res/layout/custom_checkedlistitem_layout.xml
+++ b/AndorsTrail/res/layout/custom_checkedlistitem_layout.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.gpl.rpg.AndorsTrail_beta1.view.SelectableTextView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.gpl.rpg.AndorsTrail.view.SelectableTextView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@android:id/text1"
     style="@style/checkedListItem"
     android:layout_width="match_parent"
diff --git a/AndorsTrail/res/layout/heroinfo_stats.xml b/AndorsTrail/res/layout/heroinfo_stats.xml
index d4438a91e..056f42866 100644
--- a/AndorsTrail/res/layout/heroinfo_stats.xml
+++ b/AndorsTrail/res/layout/heroinfo_stats.xml
@@ -72,18 +72,18 @@
                 android:background="?attr/ui_theme_stdframe_bitmap"
                 android:orientation="vertical" >
 
-                <com.gpl.rpg.AndorsTrail_beta1.view.RangeBar
+                <com.gpl.rpg.AndorsTrail.view.RangeBar
                     android:id="@+id/heroinfo_healthbar"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" />
 
-                <com.gpl.rpg.AndorsTrail_beta1.view.RangeBar
+                <com.gpl.rpg.AndorsTrail.view.RangeBar
                     android:id="@+id/heroinfo_expbar"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="5sp" />
                 
-                <com.gpl.rpg.AndorsTrail_beta1.view.RangeBar
+                <com.gpl.rpg.AndorsTrail.view.RangeBar
                     android:id="@+id/heroinfo_apbar"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -144,7 +144,7 @@
                     <include layout="@layout/traitsinfoview" />
                 </TableLayout>
 
-                <com.gpl.rpg.AndorsTrail_beta1.view.ItemEffectsView
+                <com.gpl.rpg.AndorsTrail.view.ItemEffectsView
                     android:id="@+id/actorinfo_onhiteffects"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" />
@@ -156,7 +156,7 @@
                     android:layout_height="wrap_content"
                     android:text="@string/actorinfo_currentconditions" />
 
-                <com.gpl.rpg.AndorsTrail_beta1.view.ActorConditionList
+                <com.gpl.rpg.AndorsTrail.view.ActorConditionList
                     android:id="@+id/actorinfo_currentconditions"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" />
diff --git a/AndorsTrail/res/layout/itemeffectview.xml b/AndorsTrail/res/layout/itemeffectview.xml
index 36c670fd4..db94f3ecd 100644
--- a/AndorsTrail/res/layout/itemeffectview.xml
+++ b/AndorsTrail/res/layout/itemeffectview.xml
@@ -12,14 +12,14 @@
 		android:layout_height="wrap_content"
 		/>
 
-		<com.gpl.rpg.AndorsTrail_beta1.view.AbilityModifierInfoView
+		<com.gpl.rpg.AndorsTrail.view.AbilityModifierInfoView
 			android:id="@+id/itemeffect_onequip_abilitymodifierinfo"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_marginLeft="10sp"
 			/>
 
-		<com.gpl.rpg.AndorsTrail_beta1.view.ActorConditionEffectList
+		<com.gpl.rpg.AndorsTrail.view.ActorConditionEffectList
 			android:id="@+id/itemeffect_onequip_conditions"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
@@ -32,7 +32,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		/>
-		<com.gpl.rpg.AndorsTrail_beta1.view.ItemEffectsView_OnUse
+		<com.gpl.rpg.AndorsTrail.view.ItemEffectsView_OnUse
 			android:id="@+id/itemeffect_onuse"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
@@ -45,7 +45,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		/>
-		<com.gpl.rpg.AndorsTrail_beta1.view.ItemEffectsView_OnUse
+		<com.gpl.rpg.AndorsTrail.view.ItemEffectsView_OnUse
 			android:id="@+id/itemeffect_onhit"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
@@ -58,7 +58,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		/>
-		<com.gpl.rpg.AndorsTrail_beta1.view.ItemEffectsView_OnUse
+		<com.gpl.rpg.AndorsTrail.view.ItemEffectsView_OnUse
 			android:id="@+id/itemeffect_onkill"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
@@ -71,7 +71,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		/>
-		<com.gpl.rpg.AndorsTrail_beta1.view.ItemEffectsView_OnHitReceived
+		<com.gpl.rpg.AndorsTrail.view.ItemEffectsView_OnHitReceived
 			android:id="@+id/itemeffect_onhitreceived"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
@@ -84,7 +84,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		/>
-		<com.gpl.rpg.AndorsTrail_beta1.view.ItemEffectsView_OnDeath
+		<com.gpl.rpg.AndorsTrail.view.ItemEffectsView_OnDeath
 			android:id="@+id/itemeffect_ondeath"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
diff --git a/AndorsTrail/res/layout/itemeffectview_ondeath.xml b/AndorsTrail/res/layout/itemeffectview_ondeath.xml
index 918390a2f..46451619a 100644
--- a/AndorsTrail/res/layout/itemeffectview_ondeath.xml
+++ b/AndorsTrail/res/layout/itemeffectview_ondeath.xml
@@ -21,7 +21,7 @@
 		>
 	</LinearLayout>
 	    
-		<com.gpl.rpg.AndorsTrail_beta1.view.ActorConditionEffectList
+		<com.gpl.rpg.AndorsTrail.view.ActorConditionEffectList
 			android:id="@+id/itemeffect_ondeath_conditions_source"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
diff --git a/AndorsTrail/res/layout/itemeffectview_onhitreceived.xml b/AndorsTrail/res/layout/itemeffectview_onhitreceived.xml
index 4fcfe6ad4..819238cc7 100644
--- a/AndorsTrail/res/layout/itemeffectview_onhitreceived.xml
+++ b/AndorsTrail/res/layout/itemeffectview_onhitreceived.xml
@@ -21,7 +21,7 @@
 		>
 	</LinearLayout>
 	
-		<com.gpl.rpg.AndorsTrail_beta1.view.ActorConditionEffectList
+		<com.gpl.rpg.AndorsTrail.view.ActorConditionEffectList
 			android:id="@+id/itemeffect_onhitreceived_conditions_source"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
@@ -43,7 +43,7 @@
 		>
 	</LinearLayout>
 	    
-		<com.gpl.rpg.AndorsTrail_beta1.view.ActorConditionEffectList
+		<com.gpl.rpg.AndorsTrail.view.ActorConditionEffectList
 			android:id="@+id/itemeffect_onhitreceived_conditions_target"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
diff --git a/AndorsTrail/res/layout/itemeffectview_onuse.xml b/AndorsTrail/res/layout/itemeffectview_onuse.xml
index 0a5843922..be5a027bd 100644
--- a/AndorsTrail/res/layout/itemeffectview_onuse.xml
+++ b/AndorsTrail/res/layout/itemeffectview_onuse.xml
@@ -19,7 +19,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		/>
-		<com.gpl.rpg.AndorsTrail_beta1.view.ActorConditionEffectList
+		<com.gpl.rpg.AndorsTrail.view.ActorConditionEffectList
 			android:id="@+id/itemeffect_onuse_conditions_source"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
@@ -32,7 +32,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		/>
-		<com.gpl.rpg.AndorsTrail_beta1.view.ActorConditionEffectList
+		<com.gpl.rpg.AndorsTrail.view.ActorConditionEffectList
 			android:id="@+id/itemeffect_onuse_conditions_target"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
diff --git a/AndorsTrail/res/layout/iteminfo.xml b/AndorsTrail/res/layout/iteminfo.xml
index 2f9833bfe..965c92cd8 100644
--- a/AndorsTrail/res/layout/iteminfo.xml
+++ b/AndorsTrail/res/layout/iteminfo.xml
@@ -55,7 +55,7 @@
                     android:layout_height="wrap_content" />
             </LinearLayout>
 
-            <com.gpl.rpg.AndorsTrail_beta1.view.ItemEffectsView
+            <com.gpl.rpg.AndorsTrail.view.ItemEffectsView
                 android:id="@+id/iteminfo_effects"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
diff --git a/AndorsTrail/res/layout/main.xml b/AndorsTrail/res/layout/main.xml
index 10ad6b75e..0ed328325 100644
--- a/AndorsTrail/res/layout/main.xml
+++ b/AndorsTrail/res/layout/main.xml
@@ -6,14 +6,14 @@
 	android:id="@+id/main_container"
 	>
 
-	<com.gpl.rpg.AndorsTrail_beta1.view.StatusView
+	<com.gpl.rpg.AndorsTrail.view.StatusView
 		android:id="@+id/main_statusview"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_alignParentBottom="true"
 		/>
 
-	<com.gpl.rpg.AndorsTrail_beta1.view.QuickitemView
+	<com.gpl.rpg.AndorsTrail.view.QuickitemView
 		android:id="@+id/main_quickitemview"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
@@ -21,7 +21,7 @@
 		android:visibility="gone"
 		/>
 
-	<com.gpl.rpg.AndorsTrail_beta1.view.CombatView
+	<com.gpl.rpg.AndorsTrail.view.CombatView
 		android:id="@+id/main_combatview"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
@@ -29,7 +29,7 @@
 		android:visibility="gone"
 		/>
 
-	<com.gpl.rpg.AndorsTrail_beta1.view.ToolboxView
+	<com.gpl.rpg.AndorsTrail.view.ToolboxView
 		android:id="@+id/main_toolboxview"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
@@ -38,7 +38,7 @@
 		android:visibility="gone"
 		/>
 
-	<com.gpl.rpg.AndorsTrail_beta1.view.MainView
+	<com.gpl.rpg.AndorsTrail.view.MainView
 		android:id="@+id/main_mainview"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
@@ -72,7 +72,7 @@
 		android:gravity="right"
 		/>
 
-	<com.gpl.rpg.AndorsTrail_beta1.view.VirtualDpadView
+	<com.gpl.rpg.AndorsTrail.view.VirtualDpadView
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:id="@+id/main_virtual_dpad"
diff --git a/AndorsTrail/res/layout/monsterinfo.xml b/AndorsTrail/res/layout/monsterinfo.xml
index de8c0e8cf..58fc47dcb 100644
--- a/AndorsTrail/res/layout/monsterinfo.xml
+++ b/AndorsTrail/res/layout/monsterinfo.xml
@@ -46,7 +46,7 @@
                     android:text="@string/monster_difficulty_normal" />
             </LinearLayout>
 
-            <com.gpl.rpg.AndorsTrail_beta1.view.RangeBar
+            <com.gpl.rpg.AndorsTrail.view.RangeBar
                 android:id="@+id/monsterinfo_healthbar"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -69,7 +69,7 @@
                 <include layout="@layout/traitsinfoview" />
             </TableLayout>
 
-            <com.gpl.rpg.AndorsTrail_beta1.view.ItemEffectsView
+            <com.gpl.rpg.AndorsTrail.view.ItemEffectsView
                 android:id="@+id/actorinfo_onhiteffects"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
@@ -81,7 +81,7 @@
                 android:layout_marginTop="@dimen/section_margin"
                 android:text="@string/actorinfo_currentconditions" />
 
-            <com.gpl.rpg.AndorsTrail_beta1.view.ActorConditionList
+            <com.gpl.rpg.AndorsTrail.view.ActorConditionList
                 android:id="@+id/actorinfo_currentconditions"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
diff --git a/AndorsTrail/res/layout/statusview.xml b/AndorsTrail/res/layout/statusview.xml
index 78ef15fb5..2fe68f9e6 100644
--- a/AndorsTrail/res/layout/statusview.xml
+++ b/AndorsTrail/res/layout/statusview.xml
@@ -36,12 +36,12 @@
             android:layout_toRightOf="@id/status_image"
             android:orientation="vertical" >
 
-            <com.gpl.rpg.AndorsTrail_beta1.view.RangeBar
+            <com.gpl.rpg.AndorsTrail.view.RangeBar
                 android:id="@+id/statusview_health"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
 
-            <com.gpl.rpg.AndorsTrail_beta1.view.RangeBar
+            <com.gpl.rpg.AndorsTrail.view.RangeBar
                 android:id="@+id/statusview_exp"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
diff --git a/AndorsTrail/res/layout/title_bg_layout.xml b/AndorsTrail/res/layout/title_bg_layout.xml
index 3a6f6fd42..e935088db 100644
--- a/AndorsTrail/res/layout/title_bg_layout.xml
+++ b/AndorsTrail/res/layout/title_bg_layout.xml
@@ -6,7 +6,7 @@
 
     <include layout="@layout/title_bg_sky_layout"/>
 
-    <com.gpl.rpg.AndorsTrail_beta1.view.CloudsAnimatorView
+    <com.gpl.rpg.AndorsTrail.view.CloudsAnimatorView
         android:id="@+id/ts_clouds_animator_back"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
@@ -21,7 +21,7 @@
         android:adjustViewBounds="true"
         android:src="@drawable/ts_background"/>
     
-    <com.gpl.rpg.AndorsTrail_beta1.view.CloudsAnimatorView
+    <com.gpl.rpg.AndorsTrail.view.CloudsAnimatorView
         android:id="@+id/ts_clouds_animator_mid"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
@@ -36,7 +36,7 @@
         android:adjustViewBounds="true"
         android:src="@drawable/ts_midground"/>
      
-    <com.gpl.rpg.AndorsTrail_beta1.view.CloudsAnimatorView
+    <com.gpl.rpg.AndorsTrail.view.CloudsAnimatorView
         android:id="@+id/ts_clouds_animator_front"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
diff --git a/AndorsTrail/res/xml/preferences.xml b/AndorsTrail/res/xml/preferences.xml
index f71d948c7..d666f56e8 100644
--- a/AndorsTrail/res/xml/preferences.xml
+++ b/AndorsTrail/res/xml/preferences.xml
@@ -7,14 +7,14 @@
 			android:defaultValue="true"
 			android:summary="@string/preferences_display_fullscreen"
 			android:key="fullscreen" />
-		<com.gpl.rpg.AndorsTrail_beta1.view.CustomListPreference
+		<com.gpl.rpg.AndorsTrail.view.CustomListPreference
 			android:title="@string/preferences_display_theme_title"
 			android:summary="@string/preferences_display_theme"
 			android:key="selectedTheme"
 			android:defaultValue="0"
 			android:entries="@array/preferences_display_theme"
 			android:entryValues="@array/preferences_display_theme_values" />
-		<com.gpl.rpg.AndorsTrail_beta1.view.CustomListPreference
+		<com.gpl.rpg.AndorsTrail.view.CustomListPreference
 			android:title="@string/preferences_display_scaling_factor_title"
 			android:summary="@string/preferences_display_scaling_factor"
 			android:key="scaling_factor"
@@ -44,14 +44,14 @@
 			android:defaultValue="true"
 			android:summary="@string/preferences_dialog_confirmattack"
 			android:key="confirm_attack" />
-		<com.gpl.rpg.AndorsTrail_beta1.view.CustomListPreference
+		<com.gpl.rpg.AndorsTrail.view.CustomListPreference
 			android:title="@string/preferences_dialog_monsterloot_title"
 			android:summary="@string/preferences_dialog_monsterloot"
 			android:key="display_lootdialog"
 			android:defaultValue="0"
 			android:entries="@array/preferences_display_loot"
 			android:entryValues="@array/preferences_display_loot_values" />
-		<com.gpl.rpg.AndorsTrail_beta1.view.CustomListPreference
+		<com.gpl.rpg.AndorsTrail.view.CustomListPreference
 			android:title="@string/preferences_dialog_overwrite_savegame_title"
 			android:summary="@string/preferences_dialog_overwrite_savegame"
 			android:key="display_overwrite_savegame"
@@ -61,7 +61,7 @@
 	</PreferenceCategory>
 	<PreferenceCategory
 		android:title="@string/preferences_combat_category">
-		<com.gpl.rpg.AndorsTrail_beta1.view.CustomListPreference
+		<com.gpl.rpg.AndorsTrail.view.CustomListPreference
 			android:title="@string/preferences_combat_speed_title"
 			android:summary="@string/preferences_combat_speed"
 			android:key="attackspeed"
@@ -71,21 +71,21 @@
 	</PreferenceCategory>
 	<PreferenceCategory
 		android:title="@string/preferences_movement_category">
-		<com.gpl.rpg.AndorsTrail_beta1.view.CustomListPreference
+		<com.gpl.rpg.AndorsTrail.view.CustomListPreference
 			android:title="@string/preferences_movementmethod_title"
 			android:summary="@string/preferences_movementmethod"
 			android:key="movementmethod"
 			android:defaultValue="0"
 			android:entries="@array/preferences_movementmethods"
 			android:entryValues="@array/preferences_movementmethod_values" />
-		<com.gpl.rpg.AndorsTrail_beta1.view.CustomListPreference
+		<com.gpl.rpg.AndorsTrail.view.CustomListPreference
 			android:title="@string/preferences_movement_dpad_position_title"
 			android:summary="@string/preferences_movement_dpad_position"
 			android:key="dpadposition"
 			android:defaultValue="0"
 			android:entries="@array/preferences_movement_dpad_positions"
 			android:entryValues="@array/preferences_movement_dpad_positions_values" />
-		<com.gpl.rpg.AndorsTrail_beta1.view.CustomListPreference
+		<com.gpl.rpg.AndorsTrail.view.CustomListPreference
 			android:title="@string/preferences_movement_dpad_transparency_title"
 			android:summary="@string/preferences_movement_dpad_transparency"
 			android:key="dpadtransparency"
@@ -105,7 +105,7 @@
 			android:defaultValue="true"
 			android:summary="@string/preferences_ui_enable_animations"
 			android:key="enableUiAnimations" />
-		<com.gpl.rpg.AndorsTrail_beta1.view.CustomListPreference
+		<com.gpl.rpg.AndorsTrail.view.CustomListPreference
 			android:title="@string/preferences_quickslots_placement"
 			android:summary="@string/preferences_quickslots_placement_summary"
 			android:key="quickslots_placement"
@@ -117,7 +117,7 @@
 			android:defaultValue="false"
 			android:summary="@string/preferences_ui_show_quickslots_when_toolbox_is_visible"
 			android:key="showQuickslotsWhenToolboxIsVisible" />
-		<com.gpl.rpg.AndorsTrail_beta1.view.CustomListPreference
+		<com.gpl.rpg.AndorsTrail.view.CustomListPreference
 			android:title="@string/preferences_language"
 			android:summary="@string/preferences_language_description"
 			android:key="language"
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/AndorsTrailApplication.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
similarity index 93%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/AndorsTrailApplication.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
index 93f0ce4e7..263d0b922 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/AndorsTrailApplication.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
@@ -1,14 +1,14 @@
-package com.gpl.rpg.AndorsTrail_beta1;
+package com.gpl.rpg.AndorsTrail;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.Locale;
 
-import com.gpl.rpg.AndorsTrail_beta1.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta1.controller.Constants;
-import com.gpl.rpg.AndorsTrail_beta1.util.AndroidStorage;
-import com.gpl.rpg.AndorsTrail_beta1.util.Pair;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.controller.Constants;
+import com.gpl.rpg.AndorsTrail.util.AndroidStorage;
+import com.gpl.rpg.AndorsTrail.util.Pair;
 
 import android.app.Activity;
 import android.app.Application;
@@ -28,7 +28,7 @@ public final class AndorsTrailApplication extends Application {
 	public static final boolean DEVELOPMENT_FASTSPEED = false;
 	public static final boolean DEVELOPMENT_VALIDATEDATA = false;
 	public static final boolean DEVELOPMENT_DEBUGMESSAGES = false;
-	public static final String CURRENT_VERSION_DISPLAY = "0.7.17beta";
+	public static final String CURRENT_VERSION_DISPLAY = "0.7.17";
 	public static final boolean IS_RELEASE_VERSION = !CURRENT_VERSION_DISPLAY.matches(".*[a-d].*");
 	public static final boolean DEVELOPMENT_INCOMPATIBLE_SAVEGAMES = DEVELOPMENT_DEBUGRESOURCES || DEVELOPMENT_DEBUGBUTTONS || DEVELOPMENT_FASTSPEED || !IS_RELEASE_VERSION;
 	public static final int DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION = 999;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/AndorsTrailPreferences.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailPreferences.java
similarity index 99%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/AndorsTrailPreferences.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailPreferences.java
index f7533578b..f12abbde1 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/AndorsTrailPreferences.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailPreferences.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1;
+package com.gpl.rpg.AndorsTrail;
 
 import android.content.Context;
 import android.content.SharedPreferences;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/Dialogs.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/Dialogs.java
similarity index 92%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/Dialogs.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/Dialogs.java
index 91c5e4f26..a501b057d 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/Dialogs.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/Dialogs.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1;
+package com.gpl.rpg.AndorsTrail;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -24,29 +24,29 @@ import android.widget.ArrayAdapter;
 import android.widget.ListView;
 import android.widget.Toast;
 
-import com.gpl.rpg.AndorsTrail_beta1.activity.ActorConditionInfoActivity;
-import com.gpl.rpg.AndorsTrail_beta1.activity.BulkSelectionInterface;
-import com.gpl.rpg.AndorsTrail_beta1.activity.ConversationActivity;
-import com.gpl.rpg.AndorsTrail_beta1.activity.ItemInfoActivity;
-import com.gpl.rpg.AndorsTrail_beta1.activity.LevelUpActivity;
-import com.gpl.rpg.AndorsTrail_beta1.activity.LoadSaveActivity;
-import com.gpl.rpg.AndorsTrail_beta1.activity.MainActivity;
-import com.gpl.rpg.AndorsTrail_beta1.activity.MonsterEncounterActivity;
-import com.gpl.rpg.AndorsTrail_beta1.activity.MonsterInfoActivity;
-import com.gpl.rpg.AndorsTrail_beta1.activity.SkillInfoActivity;
-import com.gpl.rpg.AndorsTrail_beta1.activity.fragment.StartScreenActivity_MainMenu;
-import com.gpl.rpg.AndorsTrail_beta1.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.ActorConditionType;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.SkillCollection;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Monster;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.Inventory;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemType;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.Loot;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.MapObject;
-import com.gpl.rpg.AndorsTrail_beta1.util.ThemeHelper;
-import com.gpl.rpg.AndorsTrail_beta1.view.CustomDialogFactory;
-import com.gpl.rpg.AndorsTrail_beta1.view.ItemContainerAdapter;
+import com.gpl.rpg.AndorsTrail.activity.ActorConditionInfoActivity;
+import com.gpl.rpg.AndorsTrail.activity.BulkSelectionInterface;
+import com.gpl.rpg.AndorsTrail.activity.ConversationActivity;
+import com.gpl.rpg.AndorsTrail.activity.ItemInfoActivity;
+import com.gpl.rpg.AndorsTrail.activity.LevelUpActivity;
+import com.gpl.rpg.AndorsTrail.activity.LoadSaveActivity;
+import com.gpl.rpg.AndorsTrail.activity.MainActivity;
+import com.gpl.rpg.AndorsTrail.activity.MonsterEncounterActivity;
+import com.gpl.rpg.AndorsTrail.activity.MonsterInfoActivity;
+import com.gpl.rpg.AndorsTrail.activity.SkillInfoActivity;
+import com.gpl.rpg.AndorsTrail.activity.fragment.StartScreenActivity_MainMenu;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionType;
+import com.gpl.rpg.AndorsTrail.model.ability.SkillCollection;
+import com.gpl.rpg.AndorsTrail.model.actor.Monster;
+import com.gpl.rpg.AndorsTrail.model.item.Inventory;
+import com.gpl.rpg.AndorsTrail.model.item.ItemType;
+import com.gpl.rpg.AndorsTrail.model.item.Loot;
+import com.gpl.rpg.AndorsTrail.model.map.MapObject;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
+import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory;
+import com.gpl.rpg.AndorsTrail.view.ItemContainerAdapter;
 
 public final class Dialogs {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/WorldSetup.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/WorldSetup.java
similarity index 93%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/WorldSetup.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/WorldSetup.java
index b94c56c18..4490de782 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/WorldSetup.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/WorldSetup.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1;
+package com.gpl.rpg.AndorsTrail;
 
 import java.lang.ref.WeakReference;
 
@@ -6,11 +6,11 @@ import android.content.Context;
 import android.content.res.Resources;
 import android.os.AsyncTask;
 
-import com.gpl.rpg.AndorsTrail_beta1.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta1.model.ModelContainer;
-import com.gpl.rpg.AndorsTrail_beta1.resource.ResourceLoader;
-import com.gpl.rpg.AndorsTrail_beta1.savegames.Savegames;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.model.ModelContainer;
+import com.gpl.rpg.AndorsTrail.resource.ResourceLoader;
+import com.gpl.rpg.AndorsTrail.savegames.Savegames;
 
 public final class WorldSetup {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/AboutActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/AboutActivity.java
similarity index 93%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/AboutActivity.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/AboutActivity.java
index 41f208743..ceafb5ee1 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/AboutActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/AboutActivity.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.activity;
+package com.gpl.rpg.AndorsTrail.activity;
 
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
@@ -11,9 +11,9 @@ import android.view.View.OnClickListener;
 import android.widget.Button;
 import android.widget.TextView;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta1.R;
-import com.gpl.rpg.AndorsTrail_beta1.util.ThemeHelper;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
 
 public final class AboutActivity extends AndorsTrailBaseActivity implements ImageGetter {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/ActorConditionInfoActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ActorConditionInfoActivity.java
similarity index 87%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/ActorConditionInfoActivity.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ActorConditionInfoActivity.java
index 6051ee5fe..0073e70f4 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/ActorConditionInfoActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ActorConditionInfoActivity.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.activity;
+package com.gpl.rpg.AndorsTrail.activity;
 
 import android.content.res.Resources;
 import android.os.Bundle;
@@ -9,13 +9,13 @@ import android.widget.Button;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta1.R;
-import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.ActorConditionType;
-import com.gpl.rpg.AndorsTrail_beta1.util.ThemeHelper;
-import com.gpl.rpg.AndorsTrail_beta1.view.AbilityModifierInfoView;
-import com.gpl.rpg.AndorsTrail_beta1.view.ItemEffectsView_OnUse;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionType;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
+import com.gpl.rpg.AndorsTrail.view.AbilityModifierInfoView;
+import com.gpl.rpg.AndorsTrail.view.ItemEffectsView_OnUse;
 
 public final class ActorConditionInfoActivity extends AndorsTrailBaseActivity {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/AndorsTrailBaseActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/AndorsTrailBaseActivity.java
similarity index 83%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/AndorsTrailBaseActivity.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/AndorsTrailBaseActivity.java
index 7499253d4..83f8a4d07 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/AndorsTrailBaseActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/AndorsTrailBaseActivity.java
@@ -1,9 +1,9 @@
-package com.gpl.rpg.AndorsTrail_beta1.activity;
+package com.gpl.rpg.AndorsTrail.activity;
 
 import android.app.Activity;
 import android.os.Bundle;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 
 public abstract class AndorsTrailBaseActivity extends Activity {
     @Override
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/AndorsTrailBaseFragmentActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/AndorsTrailBaseFragmentActivity.java
similarity index 84%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/AndorsTrailBaseFragmentActivity.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/AndorsTrailBaseFragmentActivity.java
index e872b68c3..ffa75e837 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/AndorsTrailBaseFragmentActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/AndorsTrailBaseFragmentActivity.java
@@ -1,9 +1,9 @@
-package com.gpl.rpg.AndorsTrail_beta1.activity;
+package com.gpl.rpg.AndorsTrail.activity;
 
 import android.os.Bundle;
 import android.support.v4.app.FragmentActivity;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 
 public abstract class AndorsTrailBaseFragmentActivity extends FragmentActivity {
     @Override
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/BulkSelectionInterface.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/BulkSelectionInterface.java
similarity index 96%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/BulkSelectionInterface.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/BulkSelectionInterface.java
index 9fcada5e9..f7b6ae87b 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/BulkSelectionInterface.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/BulkSelectionInterface.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.activity;
+package com.gpl.rpg.AndorsTrail.activity;
 
 import android.app.Dialog;
 import android.content.Intent;
@@ -16,13 +16,13 @@ import android.widget.EditText;
 import android.widget.SeekBar;
 import android.widget.TextView;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta1.R;
-import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta1.controller.ItemController;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemType;
-import com.gpl.rpg.AndorsTrail_beta1.util.ThemeHelper;
-import com.gpl.rpg.AndorsTrail_beta1.view.CustomDialogFactory;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.controller.ItemController;
+import com.gpl.rpg.AndorsTrail.model.item.ItemType;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
+import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory;
 
 /**
  * @author ejwessel
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/ConversationActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java
similarity index 94%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/ConversationActivity.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java
index d26c0c9ff..6837dd5ac 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/ConversationActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.activity;
+package com.gpl.rpg.AndorsTrail.activity;
 
 import java.util.ArrayList;
 
@@ -29,22 +29,22 @@ import android.widget.RadioGroup;
 import android.widget.TextView;
 import android.widget.TextView.BufferType;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta1.Dialogs;
-import com.gpl.rpg.AndorsTrail_beta1.R;
-import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta1.controller.ConversationController;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Actor;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Monster;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Player;
-import com.gpl.rpg.AndorsTrail_beta1.model.conversation.Reply;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.Loot;
-import com.gpl.rpg.AndorsTrail_beta1.model.quest.Quest;
-import com.gpl.rpg.AndorsTrail_beta1.model.quest.QuestLogEntry;
-import com.gpl.rpg.AndorsTrail_beta1.model.quest.QuestProgress;
-import com.gpl.rpg.AndorsTrail_beta1.resource.tiles.TileCollection;
-import com.gpl.rpg.AndorsTrail_beta1.resource.tiles.TileManager;
-import com.gpl.rpg.AndorsTrail_beta1.util.ThemeHelper;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.Dialogs;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.controller.ConversationController;
+import com.gpl.rpg.AndorsTrail.model.actor.Actor;
+import com.gpl.rpg.AndorsTrail.model.actor.Monster;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.model.conversation.Reply;
+import com.gpl.rpg.AndorsTrail.model.item.Loot;
+import com.gpl.rpg.AndorsTrail.model.quest.Quest;
+import com.gpl.rpg.AndorsTrail.model.quest.QuestLogEntry;
+import com.gpl.rpg.AndorsTrail.model.quest.QuestProgress;
+import com.gpl.rpg.AndorsTrail.resource.tiles.TileCollection;
+import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
 
 public final class ConversationActivity
 		extends AndorsTrailBaseActivity
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/DebugInterface.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DebugInterface.java
similarity index 94%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/DebugInterface.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DebugInterface.java
index a6230893b..127f7f80a 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/DebugInterface.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DebugInterface.java
@@ -1,18 +1,18 @@
-package com.gpl.rpg.AndorsTrail_beta1.activity;
+package com.gpl.rpg.AndorsTrail.activity;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta1.R;
-import com.gpl.rpg.AndorsTrail_beta1.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta1.controller.Constants;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemType;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.MapObject;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.PredefinedMap;
-import com.gpl.rpg.AndorsTrail_beta1.view.MainView;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.controller.Constants;
+import com.gpl.rpg.AndorsTrail.model.item.ItemType;
+import com.gpl.rpg.AndorsTrail.model.map.MapObject;
+import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
+import com.gpl.rpg.AndorsTrail.view.MainView;
 
 import android.content.Context;
 import android.content.res.Resources;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/DisplayWorldMapActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DisplayWorldMapActivity.java
similarity index 87%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/DisplayWorldMapActivity.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DisplayWorldMapActivity.java
index 7f0b70407..f5a3a3687 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/DisplayWorldMapActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DisplayWorldMapActivity.java
@@ -1,18 +1,18 @@
-package com.gpl.rpg.AndorsTrail_beta1.activity;
+package com.gpl.rpg.AndorsTrail.activity;
 
 import java.io.File;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta1.R;
-import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta1.controller.WorldMapController;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.PredefinedMap;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.WorldMapSegment;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.WorldMapSegment.WorldMapSegmentMap;
-import com.gpl.rpg.AndorsTrail_beta1.util.AndroidStorage;
-import com.gpl.rpg.AndorsTrail_beta1.util.Coord;
-import com.gpl.rpg.AndorsTrail_beta1.util.L;
-import com.gpl.rpg.AndorsTrail_beta1.util.ThemeHelper;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.controller.WorldMapController;
+import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
+import com.gpl.rpg.AndorsTrail.model.map.WorldMapSegment;
+import com.gpl.rpg.AndorsTrail.model.map.WorldMapSegment.WorldMapSegmentMap;
+import com.gpl.rpg.AndorsTrail.util.AndroidStorage;
+import com.gpl.rpg.AndorsTrail.util.Coord;
+import com.gpl.rpg.AndorsTrail.util.L;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
 
 import android.annotation.SuppressLint;
 import android.os.Bundle;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/HeroinfoActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/HeroinfoActivity.java
similarity index 84%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/HeroinfoActivity.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/HeroinfoActivity.java
index 81c93a40b..b22e4bbf8 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/HeroinfoActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/HeroinfoActivity.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.activity;
+package com.gpl.rpg.AndorsTrail.activity;
 
 import android.content.res.Resources;
 import android.os.Bundle;
@@ -8,14 +8,14 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta1.R;
-import com.gpl.rpg.AndorsTrail_beta1.activity.fragment.HeroinfoActivity_Inventory;
-import com.gpl.rpg.AndorsTrail_beta1.activity.fragment.HeroinfoActivity_Quests;
-import com.gpl.rpg.AndorsTrail_beta1.activity.fragment.HeroinfoActivity_Skills;
-import com.gpl.rpg.AndorsTrail_beta1.activity.fragment.HeroinfoActivity_Stats;
-import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta1.util.ThemeHelper;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.activity.fragment.HeroinfoActivity_Inventory;
+import com.gpl.rpg.AndorsTrail.activity.fragment.HeroinfoActivity_Quests;
+import com.gpl.rpg.AndorsTrail.activity.fragment.HeroinfoActivity_Skills;
+import com.gpl.rpg.AndorsTrail.activity.fragment.HeroinfoActivity_Stats;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
 
 public final class HeroinfoActivity extends AndorsTrailBaseFragmentActivity {
 	private WorldContext world;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/ItemInfoActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ItemInfoActivity.java
similarity index 91%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/ItemInfoActivity.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ItemInfoActivity.java
index 73ef1e059..3de35163d 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/ItemInfoActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ItemInfoActivity.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.activity;
+package com.gpl.rpg.AndorsTrail.activity;
 
 import java.util.Collections;
 
@@ -11,12 +11,12 @@ import android.view.View.OnClickListener;
 import android.widget.Button;
 import android.widget.TextView;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta1.R;
-import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemType;
-import com.gpl.rpg.AndorsTrail_beta1.util.ThemeHelper;
-import com.gpl.rpg.AndorsTrail_beta1.view.ItemEffectsView;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.model.item.ItemType;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
+import com.gpl.rpg.AndorsTrail.view.ItemEffectsView;
 
 public final class ItemInfoActivity extends AndorsTrailBaseActivity {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/LevelUpActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LevelUpActivity.java
similarity index 86%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/LevelUpActivity.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LevelUpActivity.java
index 264bd10ea..3f9831aa5 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/LevelUpActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LevelUpActivity.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.activity;
+package com.gpl.rpg.AndorsTrail.activity;
 
 import android.content.res.Resources;
 import android.os.Bundle;
@@ -8,14 +8,14 @@ import android.view.Window;
 import android.widget.Button;
 import android.widget.TextView;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta1.R;
-import com.gpl.rpg.AndorsTrail_beta1.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta1.controller.ActorStatsController;
-import com.gpl.rpg.AndorsTrail_beta1.controller.Constants;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Player;
-import com.gpl.rpg.AndorsTrail_beta1.util.ThemeHelper;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.controller.ActorStatsController;
+import com.gpl.rpg.AndorsTrail.controller.Constants;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
 
 public final class LevelUpActivity extends AndorsTrailBaseActivity {
 	private WorldContext world;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/LoadSaveActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LoadSaveActivity.java
similarity index 94%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/LoadSaveActivity.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LoadSaveActivity.java
index 900e1c3e5..2c92e8910 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/LoadSaveActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LoadSaveActivity.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.activity;
+package com.gpl.rpg.AndorsTrail.activity;
 
 import java.util.Collections;
 import java.util.List;
@@ -19,15 +19,15 @@ import android.widget.Button;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailPreferences;
-import com.gpl.rpg.AndorsTrail_beta1.R;
-import com.gpl.rpg.AndorsTrail_beta1.model.ModelContainer;
-import com.gpl.rpg.AndorsTrail_beta1.resource.tiles.TileManager;
-import com.gpl.rpg.AndorsTrail_beta1.savegames.Savegames;
-import com.gpl.rpg.AndorsTrail_beta1.savegames.Savegames.FileHeader;
-import com.gpl.rpg.AndorsTrail_beta1.util.ThemeHelper;
-import com.gpl.rpg.AndorsTrail_beta1.view.CustomDialogFactory;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.model.ModelContainer;
+import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
+import com.gpl.rpg.AndorsTrail.savegames.Savegames;
+import com.gpl.rpg.AndorsTrail.savegames.Savegames.FileHeader;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
+import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory;
 
 public final class LoadSaveActivity extends AndorsTrailBaseActivity implements OnClickListener {
 	private boolean isLoading = true;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/LoadingActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LoadingActivity.java
similarity index 90%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/LoadingActivity.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LoadingActivity.java
index ddd789c90..9b5e3fbb8 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/LoadingActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LoadingActivity.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.activity;
+package com.gpl.rpg.AndorsTrail.activity;
 
 import android.app.Dialog;
 import android.content.DialogInterface;
@@ -11,15 +11,15 @@ import android.view.ViewTreeObserver;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta1.R;
-import com.gpl.rpg.AndorsTrail_beta1.WorldSetup;
-import com.gpl.rpg.AndorsTrail_beta1.WorldSetup.OnResourcesLoadedListener;
-import com.gpl.rpg.AndorsTrail_beta1.WorldSetup.OnSceneLoadedListener;
-import com.gpl.rpg.AndorsTrail_beta1.savegames.Savegames;
-import com.gpl.rpg.AndorsTrail_beta1.util.ThemeHelper;
-import com.gpl.rpg.AndorsTrail_beta1.view.CloudsAnimatorView;
-import com.gpl.rpg.AndorsTrail_beta1.view.CustomDialogFactory;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.WorldSetup;
+import com.gpl.rpg.AndorsTrail.WorldSetup.OnResourcesLoadedListener;
+import com.gpl.rpg.AndorsTrail.WorldSetup.OnSceneLoadedListener;
+import com.gpl.rpg.AndorsTrail.savegames.Savegames;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
+import com.gpl.rpg.AndorsTrail.view.CloudsAnimatorView;
+import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory;
 
 public final class LoadingActivity extends AndorsTrailBaseActivity implements OnResourcesLoadedListener, OnSceneLoadedListener {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/MainActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MainActivity.java
similarity index 88%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/MainActivity.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MainActivity.java
index abeb77e10..e02869b75 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/MainActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MainActivity.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.activity;
+package com.gpl.rpg.AndorsTrail.activity;
 
 import java.lang.ref.WeakReference;
 import java.util.Collection;
@@ -18,40 +18,40 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailPreferences;
-import com.gpl.rpg.AndorsTrail_beta1.Dialogs;
-import com.gpl.rpg.AndorsTrail_beta1.R;
-import com.gpl.rpg.AndorsTrail_beta1.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta1.controller.AttackResult;
-import com.gpl.rpg.AndorsTrail_beta1.controller.CombatController;
-import com.gpl.rpg.AndorsTrail_beta1.controller.Constants;
-import com.gpl.rpg.AndorsTrail_beta1.controller.listeners.CombatActionListener;
-import com.gpl.rpg.AndorsTrail_beta1.controller.listeners.CombatTurnListener;
-import com.gpl.rpg.AndorsTrail_beta1.controller.listeners.PlayerMovementListener;
-import com.gpl.rpg.AndorsTrail_beta1.controller.listeners.WorldEventListener;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.ActorCondition;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.ActorConditionEffect;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Monster;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.Loot;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.MapObject;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.PredefinedMap;
-import com.gpl.rpg.AndorsTrail_beta1.resource.tiles.TileCollection;
-import com.gpl.rpg.AndorsTrail_beta1.savegames.Savegames;
-import com.gpl.rpg.AndorsTrail_beta1.util.Coord;
-import com.gpl.rpg.AndorsTrail_beta1.util.ThemeHelper;
-import com.gpl.rpg.AndorsTrail_beta1.view.CombatView;
-import com.gpl.rpg.AndorsTrail_beta1.view.CustomDialogFactory;
-import com.gpl.rpg.AndorsTrail_beta1.view.DisplayActiveActorConditionIcons;
-import com.gpl.rpg.AndorsTrail_beta1.view.ItemContainerAdapter;
-import com.gpl.rpg.AndorsTrail_beta1.view.MainView;
-import com.gpl.rpg.AndorsTrail_beta1.view.QuickButton;
-import com.gpl.rpg.AndorsTrail_beta1.view.QuickitemView;
-import com.gpl.rpg.AndorsTrail_beta1.view.QuickslotsItemContainerAdapter;
-import com.gpl.rpg.AndorsTrail_beta1.view.StatusView;
-import com.gpl.rpg.AndorsTrail_beta1.view.ToolboxView;
-import com.gpl.rpg.AndorsTrail_beta1.view.VirtualDpadView;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences;
+import com.gpl.rpg.AndorsTrail.Dialogs;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.controller.AttackResult;
+import com.gpl.rpg.AndorsTrail.controller.CombatController;
+import com.gpl.rpg.AndorsTrail.controller.Constants;
+import com.gpl.rpg.AndorsTrail.controller.listeners.CombatActionListener;
+import com.gpl.rpg.AndorsTrail.controller.listeners.CombatTurnListener;
+import com.gpl.rpg.AndorsTrail.controller.listeners.PlayerMovementListener;
+import com.gpl.rpg.AndorsTrail.controller.listeners.WorldEventListener;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorCondition;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionEffect;
+import com.gpl.rpg.AndorsTrail.model.actor.Monster;
+import com.gpl.rpg.AndorsTrail.model.item.Loot;
+import com.gpl.rpg.AndorsTrail.model.map.MapObject;
+import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
+import com.gpl.rpg.AndorsTrail.resource.tiles.TileCollection;
+import com.gpl.rpg.AndorsTrail.savegames.Savegames;
+import com.gpl.rpg.AndorsTrail.util.Coord;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
+import com.gpl.rpg.AndorsTrail.view.CombatView;
+import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory;
+import com.gpl.rpg.AndorsTrail.view.DisplayActiveActorConditionIcons;
+import com.gpl.rpg.AndorsTrail.view.ItemContainerAdapter;
+import com.gpl.rpg.AndorsTrail.view.MainView;
+import com.gpl.rpg.AndorsTrail.view.QuickButton;
+import com.gpl.rpg.AndorsTrail.view.QuickitemView;
+import com.gpl.rpg.AndorsTrail.view.QuickslotsItemContainerAdapter;
+import com.gpl.rpg.AndorsTrail.view.StatusView;
+import com.gpl.rpg.AndorsTrail.view.ToolboxView;
+import com.gpl.rpg.AndorsTrail.view.VirtualDpadView;
 
 public final class MainActivity
 		extends AndorsTrailBaseActivity
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/MonsterEncounterActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MonsterEncounterActivity.java
similarity index 82%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/MonsterEncounterActivity.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MonsterEncounterActivity.java
index 5a2a82ada..5d11ea8a5 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/MonsterEncounterActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MonsterEncounterActivity.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.activity;
+package com.gpl.rpg.AndorsTrail.activity;
 
 import android.os.Bundle;
 import android.view.View;
@@ -7,13 +7,13 @@ import android.view.Window;
 import android.widget.Button;
 import android.widget.TextView;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta1.Dialogs;
-import com.gpl.rpg.AndorsTrail_beta1.R;
-import com.gpl.rpg.AndorsTrail_beta1.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Monster;
-import com.gpl.rpg.AndorsTrail_beta1.util.ThemeHelper;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.Dialogs;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.model.actor.Monster;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
 
 public final class MonsterEncounterActivity extends AndorsTrailBaseActivity {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/MonsterInfoActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MonsterInfoActivity.java
similarity index 84%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/MonsterInfoActivity.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MonsterInfoActivity.java
index 0ff37c028..a34b1f3b4 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/MonsterInfoActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MonsterInfoActivity.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.activity;
+package com.gpl.rpg.AndorsTrail.activity;
 
 import android.os.Bundle;
 import android.view.View;
@@ -8,16 +8,16 @@ import android.view.Window;
 import android.widget.Button;
 import android.widget.TextView;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta1.Dialogs;
-import com.gpl.rpg.AndorsTrail_beta1.R;
-import com.gpl.rpg.AndorsTrail_beta1.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Monster;
-import com.gpl.rpg.AndorsTrail_beta1.util.ThemeHelper;
-import com.gpl.rpg.AndorsTrail_beta1.view.ItemEffectsView;
-import com.gpl.rpg.AndorsTrail_beta1.view.RangeBar;
-import com.gpl.rpg.AndorsTrail_beta1.view.TraitsInfoView;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.Dialogs;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.model.actor.Monster;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
+import com.gpl.rpg.AndorsTrail.view.ItemEffectsView;
+import com.gpl.rpg.AndorsTrail.view.RangeBar;
+import com.gpl.rpg.AndorsTrail.view.TraitsInfoView;
 
 public final class MonsterInfoActivity extends AndorsTrailBaseActivity {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/Preferences.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/Preferences.java
similarity index 82%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/Preferences.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/Preferences.java
index 177277af1..c524089cd 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/Preferences.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/Preferences.java
@@ -1,13 +1,13 @@
-package com.gpl.rpg.AndorsTrail_beta1.activity;
+package com.gpl.rpg.AndorsTrail.activity;
 
 import android.os.Bundle;
 import android.preference.PreferenceActivity;
 import android.view.Window;
 import android.view.WindowManager;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta1.R;
-import com.gpl.rpg.AndorsTrail_beta1.util.ThemeHelper;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
 
 public final class Preferences extends PreferenceActivity {
 	@Override
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/ShopActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ShopActivity.java
similarity index 82%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/ShopActivity.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ShopActivity.java
index 849a283a3..22488483f 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/ShopActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ShopActivity.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.activity;
+package com.gpl.rpg.AndorsTrail.activity;
 
 import android.content.res.Resources;
 import android.os.Bundle;
@@ -8,11 +8,11 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta1.R;
-import com.gpl.rpg.AndorsTrail_beta1.activity.fragment.ShopActivity_Buy;
-import com.gpl.rpg.AndorsTrail_beta1.activity.fragment.ShopActivity_Sell;
-import com.gpl.rpg.AndorsTrail_beta1.util.ThemeHelper;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.activity.fragment.ShopActivity_Buy;
+import com.gpl.rpg.AndorsTrail.activity.fragment.ShopActivity_Sell;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
 
 public final class ShopActivity extends AndorsTrailBaseFragmentActivity {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/SkillInfoActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/SkillInfoActivity.java
similarity index 96%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/SkillInfoActivity.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/SkillInfoActivity.java
index 06c5cc896..88c8dee99 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/SkillInfoActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/SkillInfoActivity.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.activity;
+package com.gpl.rpg.AndorsTrail.activity;
 
 import android.content.Intent;
 import android.content.res.Resources;
@@ -10,15 +10,15 @@ import android.view.ViewGroup.LayoutParams;
 import android.widget.Button;
 import android.widget.TextView;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta1.R;
-import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta1.controller.SkillController;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.SkillCollection;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.SkillInfo;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.SkillInfo.SkillLevelRequirement;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Player;
-import com.gpl.rpg.AndorsTrail_beta1.util.ThemeHelper;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.controller.SkillController;
+import com.gpl.rpg.AndorsTrail.model.ability.SkillCollection;
+import com.gpl.rpg.AndorsTrail.model.ability.SkillInfo;
+import com.gpl.rpg.AndorsTrail.model.ability.SkillInfo.SkillLevelRequirement;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
 
 public final class SkillInfoActivity extends AndorsTrailBaseActivity {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/StartScreenActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/StartScreenActivity.java
similarity index 91%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/StartScreenActivity.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/StartScreenActivity.java
index 303457392..cfddf7b10 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/StartScreenActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/StartScreenActivity.java
@@ -1,16 +1,16 @@
-package com.gpl.rpg.AndorsTrail_beta1.activity;
+package com.gpl.rpg.AndorsTrail.activity;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailPreferences;
-import com.gpl.rpg.AndorsTrail_beta1.R;
-import com.gpl.rpg.AndorsTrail_beta1.activity.fragment.StartScreenActivity_MainMenu;
-import com.gpl.rpg.AndorsTrail_beta1.activity.fragment.StartScreenActivity_MainMenu.OnNewGameRequestedListener;
-import com.gpl.rpg.AndorsTrail_beta1.activity.fragment.StartScreenActivity_NewGame;
-import com.gpl.rpg.AndorsTrail_beta1.activity.fragment.StartScreenActivity_NewGame.GameCreationOverListener;
-import com.gpl.rpg.AndorsTrail_beta1.resource.tiles.TileManager;
-import com.gpl.rpg.AndorsTrail_beta1.util.ThemeHelper;
-import com.gpl.rpg.AndorsTrail_beta1.view.CloudsAnimatorView;
-import com.gpl.rpg.AndorsTrail_beta1.view.CustomDialogFactory;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.activity.fragment.StartScreenActivity_MainMenu;
+import com.gpl.rpg.AndorsTrail.activity.fragment.StartScreenActivity_MainMenu.OnNewGameRequestedListener;
+import com.gpl.rpg.AndorsTrail.activity.fragment.StartScreenActivity_NewGame;
+import com.gpl.rpg.AndorsTrail.activity.fragment.StartScreenActivity_NewGame.GameCreationOverListener;
+import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
+import com.gpl.rpg.AndorsTrail.view.CloudsAnimatorView;
+import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory;
 
 import android.app.Activity;
 import android.app.Dialog;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/fragment/HeroinfoActivity_Inventory.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Inventory.java
similarity index 95%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/fragment/HeroinfoActivity_Inventory.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Inventory.java
index c6e4dd91b..43f44e367 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/fragment/HeroinfoActivity_Inventory.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Inventory.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.activity.fragment;
+package com.gpl.rpg.AndorsTrail.activity.fragment;
 
 import java.util.Arrays;
 
@@ -21,22 +21,22 @@ import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta1.Dialogs;
-import com.gpl.rpg.AndorsTrail_beta1.R;
-import com.gpl.rpg.AndorsTrail_beta1.activity.ItemInfoActivity;
-import com.gpl.rpg.AndorsTrail_beta1.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta1.controller.ItemController;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.HeroCollection;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Player;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.Inventory;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemContainer;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemType;
-import com.gpl.rpg.AndorsTrail_beta1.resource.tiles.TileCollection;
-import com.gpl.rpg.AndorsTrail_beta1.view.CustomMenuInflater;
-import com.gpl.rpg.AndorsTrail_beta1.view.ItemContainerAdapter;
-import com.gpl.rpg.AndorsTrail_beta1.view.SpinnerEmulator;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.Dialogs;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.activity.ItemInfoActivity;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.controller.ItemController;
+import com.gpl.rpg.AndorsTrail.model.actor.HeroCollection;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.model.item.Inventory;
+import com.gpl.rpg.AndorsTrail.model.item.ItemContainer;
+import com.gpl.rpg.AndorsTrail.model.item.ItemType;
+import com.gpl.rpg.AndorsTrail.resource.tiles.TileCollection;
+import com.gpl.rpg.AndorsTrail.view.CustomMenuInflater;
+import com.gpl.rpg.AndorsTrail.view.ItemContainerAdapter;
+import com.gpl.rpg.AndorsTrail.view.SpinnerEmulator;
 
 public final class HeroinfoActivity_Inventory extends Fragment implements CustomMenuInflater.MenuItemSelectedListener {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/fragment/HeroinfoActivity_Quests.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Quests.java
similarity index 90%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/fragment/HeroinfoActivity_Quests.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Quests.java
index 248834ad2..f4fe48b9a 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/fragment/HeroinfoActivity_Quests.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Quests.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.activity.fragment;
+package com.gpl.rpg.AndorsTrail.activity.fragment;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -15,13 +15,13 @@ import android.view.ViewGroup;
 import android.widget.ExpandableListView;
 import android.widget.SimpleExpandableListAdapter;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta1.R;
-import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Player;
-import com.gpl.rpg.AndorsTrail_beta1.model.quest.Quest;
-import com.gpl.rpg.AndorsTrail_beta1.model.quest.QuestLogEntry;
-import com.gpl.rpg.AndorsTrail_beta1.view.SpinnerEmulator;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.model.quest.Quest;
+import com.gpl.rpg.AndorsTrail.model.quest.QuestLogEntry;
+import com.gpl.rpg.AndorsTrail.view.SpinnerEmulator;
 
 public final class HeroinfoActivity_Quests extends Fragment {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/fragment/HeroinfoActivity_Skills.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Skills.java
similarity index 90%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/fragment/HeroinfoActivity_Skills.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Skills.java
index 2d5097d2b..1d6b6511f 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/fragment/HeroinfoActivity_Skills.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Skills.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.activity.fragment;
+package com.gpl.rpg.AndorsTrail.activity.fragment;
 
 import java.util.ArrayList;
 
@@ -14,15 +14,15 @@ import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ListView;
 import android.widget.TextView;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta1.Dialogs;
-import com.gpl.rpg.AndorsTrail_beta1.R;
-import com.gpl.rpg.AndorsTrail_beta1.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.SkillCollection;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Player;
-import com.gpl.rpg.AndorsTrail_beta1.view.SkillListAdapter;
-import com.gpl.rpg.AndorsTrail_beta1.view.SpinnerEmulator;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.Dialogs;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.model.ability.SkillCollection;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.view.SkillListAdapter;
+import com.gpl.rpg.AndorsTrail.view.SpinnerEmulator;
 public final class HeroinfoActivity_Skills extends Fragment {
 
 	private static final int INTENTREQUEST_SKILLINFO = 12;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/fragment/HeroinfoActivity_Stats.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Stats.java
similarity index 91%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/fragment/HeroinfoActivity_Stats.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Stats.java
index 318e87ede..2d7bcb221 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/fragment/HeroinfoActivity_Stats.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Stats.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.activity.fragment;
+package com.gpl.rpg.AndorsTrail.activity.fragment;
 
 import java.util.ArrayList;
 
@@ -15,20 +15,20 @@ import android.widget.TableLayout;
 import android.widget.TableRow;
 import android.widget.TextView;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta1.Dialogs;
-import com.gpl.rpg.AndorsTrail_beta1.R;
-import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta1.model.GameStatistics;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.HeroCollection;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Player;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.Inventory;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemTraits_OnHitReceived;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemTraits_OnUse;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemType;
-import com.gpl.rpg.AndorsTrail_beta1.view.ItemEffectsView;
-import com.gpl.rpg.AndorsTrail_beta1.view.RangeBar;
-import com.gpl.rpg.AndorsTrail_beta1.view.TraitsInfoView;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.Dialogs;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.model.GameStatistics;
+import com.gpl.rpg.AndorsTrail.model.actor.HeroCollection;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.model.item.Inventory;
+import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnHitReceived;
+import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnUse;
+import com.gpl.rpg.AndorsTrail.model.item.ItemType;
+import com.gpl.rpg.AndorsTrail.view.ItemEffectsView;
+import com.gpl.rpg.AndorsTrail.view.RangeBar;
+import com.gpl.rpg.AndorsTrail.view.TraitsInfoView;
 
 public final class HeroinfoActivity_Stats extends Fragment {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/fragment/ShopActivityFragment.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/ShopActivityFragment.java
similarity index 82%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/fragment/ShopActivityFragment.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/ShopActivityFragment.java
index fb67b5d31..fe317feae 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/fragment/ShopActivityFragment.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/ShopActivityFragment.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.activity.fragment;
+package com.gpl.rpg.AndorsTrail.activity.fragment;
 
 import java.util.HashSet;
 
@@ -13,17 +13,17 @@ import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta1.Dialogs;
-import com.gpl.rpg.AndorsTrail_beta1.R;
-import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Monster;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Player;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemContainer;
-import com.gpl.rpg.AndorsTrail_beta1.resource.tiles.TileCollection;
-import com.gpl.rpg.AndorsTrail_beta1.view.ShopItemContainerAdapter;
-import com.gpl.rpg.AndorsTrail_beta1.view.SpinnerEmulator;
-import com.gpl.rpg.AndorsTrail_beta1.view.ShopItemContainerAdapter.OnContainerItemClickedListener;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.Dialogs;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.model.actor.Monster;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.model.item.ItemContainer;
+import com.gpl.rpg.AndorsTrail.resource.tiles.TileCollection;
+import com.gpl.rpg.AndorsTrail.view.ShopItemContainerAdapter;
+import com.gpl.rpg.AndorsTrail.view.SpinnerEmulator;
+import com.gpl.rpg.AndorsTrail.view.ShopItemContainerAdapter.OnContainerItemClickedListener;
 
 public abstract class ShopActivityFragment extends Fragment implements OnContainerItemClickedListener {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/fragment/ShopActivity_Buy.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/ShopActivity_Buy.java
similarity index 85%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/fragment/ShopActivity_Buy.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/ShopActivity_Buy.java
index 0dfac7c7e..6c2702e45 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/fragment/ShopActivity_Buy.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/ShopActivity_Buy.java
@@ -1,13 +1,13 @@
-package com.gpl.rpg.AndorsTrail_beta1.activity.fragment;
+package com.gpl.rpg.AndorsTrail.activity.fragment;
 
 import android.app.Activity;
 import android.content.Intent;
 
-import com.gpl.rpg.AndorsTrail_beta1.Dialogs;
-import com.gpl.rpg.AndorsTrail_beta1.R;
-import com.gpl.rpg.AndorsTrail_beta1.activity.ItemInfoActivity;
-import com.gpl.rpg.AndorsTrail_beta1.controller.ItemController;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemType;
+import com.gpl.rpg.AndorsTrail.Dialogs;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.activity.ItemInfoActivity;
+import com.gpl.rpg.AndorsTrail.controller.ItemController;
+import com.gpl.rpg.AndorsTrail.model.item.ItemType;
 
 public final class ShopActivity_Buy extends ShopActivityFragment {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/fragment/ShopActivity_Sell.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/ShopActivity_Sell.java
similarity index 85%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/fragment/ShopActivity_Sell.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/ShopActivity_Sell.java
index 8311397dd..7760ab675 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/fragment/ShopActivity_Sell.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/ShopActivity_Sell.java
@@ -1,13 +1,13 @@
-package com.gpl.rpg.AndorsTrail_beta1.activity.fragment;
+package com.gpl.rpg.AndorsTrail.activity.fragment;
 
 import android.app.Activity;
 import android.content.Intent;
 
-import com.gpl.rpg.AndorsTrail_beta1.Dialogs;
-import com.gpl.rpg.AndorsTrail_beta1.R;
-import com.gpl.rpg.AndorsTrail_beta1.activity.ItemInfoActivity;
-import com.gpl.rpg.AndorsTrail_beta1.controller.ItemController;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemType;
+import com.gpl.rpg.AndorsTrail.Dialogs;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.activity.ItemInfoActivity;
+import com.gpl.rpg.AndorsTrail.controller.ItemController;
+import com.gpl.rpg.AndorsTrail.model.item.ItemType;
 
 public final class ShopActivity_Sell extends ShopActivityFragment {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/fragment/StartScreenActivity_MainMenu.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/StartScreenActivity_MainMenu.java
similarity index 93%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/fragment/StartScreenActivity_MainMenu.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/StartScreenActivity_MainMenu.java
index 05daace57..92385a563 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/fragment/StartScreenActivity_MainMenu.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/StartScreenActivity_MainMenu.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.activity.fragment;
+package com.gpl.rpg.AndorsTrail.activity.fragment;
 
 import android.Manifest;
 import android.annotation.SuppressLint;
@@ -22,22 +22,22 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailPreferences;
-import com.gpl.rpg.AndorsTrail_beta1.Dialogs;
-import com.gpl.rpg.AndorsTrail_beta1.R;
-import com.gpl.rpg.AndorsTrail_beta1.WorldSetup;
-import com.gpl.rpg.AndorsTrail_beta1.activity.AboutActivity;
-import com.gpl.rpg.AndorsTrail_beta1.activity.LoadingActivity;
-import com.gpl.rpg.AndorsTrail_beta1.activity.Preferences;
-import com.gpl.rpg.AndorsTrail_beta1.controller.Constants;
-import com.gpl.rpg.AndorsTrail_beta1.resource.tiles.TileManager;
-import com.gpl.rpg.AndorsTrail_beta1.savegames.Savegames;
-import com.gpl.rpg.AndorsTrail_beta1.savegames.Savegames.FileHeader;
-import com.gpl.rpg.AndorsTrail_beta1.util.AndroidStorage;
-import com.gpl.rpg.AndorsTrail_beta1.util.L;
-import com.gpl.rpg.AndorsTrail_beta1.util.ThemeHelper;
-import com.gpl.rpg.AndorsTrail_beta1.view.CustomDialogFactory;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences;
+import com.gpl.rpg.AndorsTrail.Dialogs;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.WorldSetup;
+import com.gpl.rpg.AndorsTrail.activity.AboutActivity;
+import com.gpl.rpg.AndorsTrail.activity.LoadingActivity;
+import com.gpl.rpg.AndorsTrail.activity.Preferences;
+import com.gpl.rpg.AndorsTrail.controller.Constants;
+import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
+import com.gpl.rpg.AndorsTrail.savegames.Savegames;
+import com.gpl.rpg.AndorsTrail.savegames.Savegames.FileHeader;
+import com.gpl.rpg.AndorsTrail.util.AndroidStorage;
+import com.gpl.rpg.AndorsTrail.util.L;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
+import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory;
 
 public class StartScreenActivity_MainMenu extends Fragment {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/fragment/StartScreenActivity_NewGame.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/StartScreenActivity_NewGame.java
similarity index 92%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/fragment/StartScreenActivity_NewGame.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/StartScreenActivity_NewGame.java
index 44a301ece..a401572bc 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/fragment/StartScreenActivity_NewGame.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/StartScreenActivity_NewGame.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.activity.fragment;
+package com.gpl.rpg.AndorsTrail.activity.fragment;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -15,12 +15,12 @@ import android.widget.TextView;
 import android.widget.Toast;
 import android.widget.ToggleButton;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta1.R;
-import com.gpl.rpg.AndorsTrail_beta1.WorldSetup;
-import com.gpl.rpg.AndorsTrail_beta1.activity.LoadingActivity;
-import com.gpl.rpg.AndorsTrail_beta1.resource.tiles.TileManager;
-import com.gpl.rpg.AndorsTrail_beta1.view.SpinnerEmulator;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.WorldSetup;
+import com.gpl.rpg.AndorsTrail.activity.LoadingActivity;
+import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
+import com.gpl.rpg.AndorsTrail.view.SpinnerEmulator;
 
 public class StartScreenActivity_NewGame extends Fragment {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/context/ControllerContext.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/context/ControllerContext.java
similarity index 67%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/context/ControllerContext.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/context/ControllerContext.java
index 19523854c..beee02542 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/context/ControllerContext.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/context/ControllerContext.java
@@ -1,24 +1,24 @@
-package com.gpl.rpg.AndorsTrail_beta1.context;
+package com.gpl.rpg.AndorsTrail.context;
 
 import java.lang.ref.WeakReference;
 
 import android.content.Context;
 import android.content.res.Resources;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailPreferences;
-import com.gpl.rpg.AndorsTrail_beta1.controller.ActorStatsController;
-import com.gpl.rpg.AndorsTrail_beta1.controller.CombatController;
-import com.gpl.rpg.AndorsTrail_beta1.controller.ConversationController;
-import com.gpl.rpg.AndorsTrail_beta1.controller.GameRoundController;
-import com.gpl.rpg.AndorsTrail_beta1.controller.InputController;
-import com.gpl.rpg.AndorsTrail_beta1.controller.ItemController;
-import com.gpl.rpg.AndorsTrail_beta1.controller.MapController;
-import com.gpl.rpg.AndorsTrail_beta1.controller.MonsterMovementController;
-import com.gpl.rpg.AndorsTrail_beta1.controller.MonsterSpawningController;
-import com.gpl.rpg.AndorsTrail_beta1.controller.MovementController;
-import com.gpl.rpg.AndorsTrail_beta1.controller.SkillController;
-import com.gpl.rpg.AndorsTrail_beta1.controller.VisualEffectController;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences;
+import com.gpl.rpg.AndorsTrail.controller.ActorStatsController;
+import com.gpl.rpg.AndorsTrail.controller.CombatController;
+import com.gpl.rpg.AndorsTrail.controller.ConversationController;
+import com.gpl.rpg.AndorsTrail.controller.GameRoundController;
+import com.gpl.rpg.AndorsTrail.controller.InputController;
+import com.gpl.rpg.AndorsTrail.controller.ItemController;
+import com.gpl.rpg.AndorsTrail.controller.MapController;
+import com.gpl.rpg.AndorsTrail.controller.MonsterMovementController;
+import com.gpl.rpg.AndorsTrail.controller.MonsterSpawningController;
+import com.gpl.rpg.AndorsTrail.controller.MovementController;
+import com.gpl.rpg.AndorsTrail.controller.SkillController;
+import com.gpl.rpg.AndorsTrail.controller.VisualEffectController;
 
 public final class ControllerContext {
 	//Controllers
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/context/WorldContext.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/context/WorldContext.java
similarity index 67%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/context/WorldContext.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/context/WorldContext.java
index 6a8f8cc9c..a3bd99db5 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/context/WorldContext.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/context/WorldContext.java
@@ -1,17 +1,17 @@
-package com.gpl.rpg.AndorsTrail_beta1.context;
+package com.gpl.rpg.AndorsTrail.context;
 
-import com.gpl.rpg.AndorsTrail_beta1.model.ModelContainer;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.ActorConditionTypeCollection;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.SkillCollection;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.MonsterTypeCollection;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.DropListCollection;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemCategoryCollection;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemTypeCollection;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.MapCollection;
-import com.gpl.rpg.AndorsTrail_beta1.model.quest.QuestCollection;
-import com.gpl.rpg.AndorsTrail_beta1.resource.ConversationLoader;
-import com.gpl.rpg.AndorsTrail_beta1.resource.VisualEffectCollection;
-import com.gpl.rpg.AndorsTrail_beta1.resource.tiles.TileManager;
+import com.gpl.rpg.AndorsTrail.model.ModelContainer;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionTypeCollection;
+import com.gpl.rpg.AndorsTrail.model.ability.SkillCollection;
+import com.gpl.rpg.AndorsTrail.model.actor.MonsterTypeCollection;
+import com.gpl.rpg.AndorsTrail.model.item.DropListCollection;
+import com.gpl.rpg.AndorsTrail.model.item.ItemCategoryCollection;
+import com.gpl.rpg.AndorsTrail.model.item.ItemTypeCollection;
+import com.gpl.rpg.AndorsTrail.model.map.MapCollection;
+import com.gpl.rpg.AndorsTrail.model.quest.QuestCollection;
+import com.gpl.rpg.AndorsTrail.resource.ConversationLoader;
+import com.gpl.rpg.AndorsTrail.resource.VisualEffectCollection;
+import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
 
 public final class WorldContext {
 	//Objectcollections
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/ActorStatsController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ActorStatsController.java
similarity index 94%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/ActorStatsController.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ActorStatsController.java
index 44ab48b4f..b6a488c02 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/ActorStatsController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ActorStatsController.java
@@ -1,31 +1,31 @@
-package com.gpl.rpg.AndorsTrail_beta1.controller;
+package com.gpl.rpg.AndorsTrail.controller;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import com.gpl.rpg.AndorsTrail_beta1.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta1.controller.listeners.ActorConditionListeners;
-import com.gpl.rpg.AndorsTrail_beta1.controller.listeners.ActorStatsListeners;
-import com.gpl.rpg.AndorsTrail_beta1.controller.listeners.CombatActionListeners;
-import com.gpl.rpg.AndorsTrail_beta1.controller.listeners.PlayerStatsListeners;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.ActorCondition;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.ActorConditionEffect;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.ActorConditionType;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.SkillCollection;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.traits.AbilityModifierTraits;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.traits.StatsModifierTraits;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Actor;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Monster;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Player;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.Inventory;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemTraits_OnEquip;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemTraits_OnHitReceived;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemTraits_OnUse;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemType;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.MonsterSpawnArea;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.PredefinedMap;
-import com.gpl.rpg.AndorsTrail_beta1.resource.VisualEffectCollection;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.controller.listeners.ActorConditionListeners;
+import com.gpl.rpg.AndorsTrail.controller.listeners.ActorStatsListeners;
+import com.gpl.rpg.AndorsTrail.controller.listeners.CombatActionListeners;
+import com.gpl.rpg.AndorsTrail.controller.listeners.PlayerStatsListeners;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorCondition;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionEffect;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionType;
+import com.gpl.rpg.AndorsTrail.model.ability.SkillCollection;
+import com.gpl.rpg.AndorsTrail.model.ability.traits.AbilityModifierTraits;
+import com.gpl.rpg.AndorsTrail.model.ability.traits.StatsModifierTraits;
+import com.gpl.rpg.AndorsTrail.model.actor.Actor;
+import com.gpl.rpg.AndorsTrail.model.actor.Monster;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.model.item.Inventory;
+import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnEquip;
+import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnHitReceived;
+import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnUse;
+import com.gpl.rpg.AndorsTrail.model.item.ItemType;
+import com.gpl.rpg.AndorsTrail.model.map.MonsterSpawnArea;
+import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
+import com.gpl.rpg.AndorsTrail.resource.VisualEffectCollection;
 
 public final class ActorStatsController {
 	private final ControllerContext controllers;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/AttackResult.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/AttackResult.java
similarity index 90%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/AttackResult.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/AttackResult.java
index 641d3ac41..dc62a743f 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/AttackResult.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/AttackResult.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.controller;
+package com.gpl.rpg.AndorsTrail.controller;
 
 public final class AttackResult {
 	public final boolean isHit;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/CombatController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java
similarity index 94%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/CombatController.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java
index 39a5d5c60..e991454af 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/CombatController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java
@@ -1,30 +1,30 @@
-package com.gpl.rpg.AndorsTrail_beta1.controller;
+package com.gpl.rpg.AndorsTrail.controller;
 
 import java.util.ArrayList;
 
 import android.os.Handler;
 import android.os.Message;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailPreferences;
-import com.gpl.rpg.AndorsTrail_beta1.R;
-import com.gpl.rpg.AndorsTrail_beta1.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta1.controller.VisualEffectController.VisualEffectCompletedCallback;
-import com.gpl.rpg.AndorsTrail_beta1.controller.listeners.CombatActionListeners;
-import com.gpl.rpg.AndorsTrail_beta1.controller.listeners.CombatSelectionListeners;
-import com.gpl.rpg.AndorsTrail_beta1.controller.listeners.CombatTurnListeners;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.SkillCollection;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Actor;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Monster;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.MonsterType;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Player;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemContainer;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemTraits_OnHitReceived;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemTraits_OnUse;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.Loot;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.MonsterSpawnArea;
-import com.gpl.rpg.AndorsTrail_beta1.resource.VisualEffectCollection;
-import com.gpl.rpg.AndorsTrail_beta1.util.Coord;
+import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.controller.VisualEffectController.VisualEffectCompletedCallback;
+import com.gpl.rpg.AndorsTrail.controller.listeners.CombatActionListeners;
+import com.gpl.rpg.AndorsTrail.controller.listeners.CombatSelectionListeners;
+import com.gpl.rpg.AndorsTrail.controller.listeners.CombatTurnListeners;
+import com.gpl.rpg.AndorsTrail.model.ability.SkillCollection;
+import com.gpl.rpg.AndorsTrail.model.actor.Actor;
+import com.gpl.rpg.AndorsTrail.model.actor.Monster;
+import com.gpl.rpg.AndorsTrail.model.actor.MonsterType;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.model.item.ItemContainer;
+import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnHitReceived;
+import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnUse;
+import com.gpl.rpg.AndorsTrail.model.item.Loot;
+import com.gpl.rpg.AndorsTrail.model.map.MonsterSpawnArea;
+import com.gpl.rpg.AndorsTrail.resource.VisualEffectCollection;
+import com.gpl.rpg.AndorsTrail.util.Coord;
 
 import static java.lang.Math.max;
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/CombatControllerTest.java.txt b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatControllerTest.java.txt
similarity index 100%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/CombatControllerTest.java.txt
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatControllerTest.java.txt
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/Constants.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/Constants.java
similarity index 94%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/Constants.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/Constants.java
index 6d5720227..88c2adff8 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/Constants.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/Constants.java
@@ -1,10 +1,10 @@
-package com.gpl.rpg.AndorsTrail_beta1.controller;
+package com.gpl.rpg.AndorsTrail.controller;
 
 import java.util.Random;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta1.util.ConstRange;
-import com.gpl.rpg.AndorsTrail_beta1.util.Range;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.util.ConstRange;
+import com.gpl.rpg.AndorsTrail.util.Range;
 
 public final class Constants {
 	public static final int PERCENT_EXP_LOST_WHEN_DIED = 30;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/ConversationController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationController.java
similarity index 91%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/ConversationController.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationController.java
index b61a210ec..02ef764ab 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/ConversationController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationController.java
@@ -1,35 +1,35 @@
-package com.gpl.rpg.AndorsTrail_beta1.controller;
+package com.gpl.rpg.AndorsTrail.controller;
 
 import java.util.ArrayList;
 
 import android.content.res.Resources;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta1.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta1.model.GameStatistics;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.ActorCondition;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.ActorConditionEffect;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.ActorConditionType;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.SkillCollection;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.SkillInfo;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Actor;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Monster;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Player;
-import com.gpl.rpg.AndorsTrail_beta1.model.conversation.ConversationCollection;
-import com.gpl.rpg.AndorsTrail_beta1.model.conversation.Phrase;
-import com.gpl.rpg.AndorsTrail_beta1.model.conversation.Reply;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemTypeCollection;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.Loot;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.LayeredTileMap;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.MonsterSpawnArea;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.PredefinedMap;
-import com.gpl.rpg.AndorsTrail_beta1.model.quest.QuestLogEntry;
-import com.gpl.rpg.AndorsTrail_beta1.model.quest.QuestProgress;
-import com.gpl.rpg.AndorsTrail_beta1.model.script.Requirement;
-import com.gpl.rpg.AndorsTrail_beta1.model.script.ScriptEffect;
-import com.gpl.rpg.AndorsTrail_beta1.util.ConstRange;
-import com.gpl.rpg.AndorsTrail_beta1.util.L;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.model.GameStatistics;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorCondition;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionEffect;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionType;
+import com.gpl.rpg.AndorsTrail.model.ability.SkillCollection;
+import com.gpl.rpg.AndorsTrail.model.ability.SkillInfo;
+import com.gpl.rpg.AndorsTrail.model.actor.Actor;
+import com.gpl.rpg.AndorsTrail.model.actor.Monster;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.model.conversation.ConversationCollection;
+import com.gpl.rpg.AndorsTrail.model.conversation.Phrase;
+import com.gpl.rpg.AndorsTrail.model.conversation.Reply;
+import com.gpl.rpg.AndorsTrail.model.item.ItemTypeCollection;
+import com.gpl.rpg.AndorsTrail.model.item.Loot;
+import com.gpl.rpg.AndorsTrail.model.map.LayeredTileMap;
+import com.gpl.rpg.AndorsTrail.model.map.MonsterSpawnArea;
+import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
+import com.gpl.rpg.AndorsTrail.model.quest.QuestLogEntry;
+import com.gpl.rpg.AndorsTrail.model.quest.QuestProgress;
+import com.gpl.rpg.AndorsTrail.model.script.Requirement;
+import com.gpl.rpg.AndorsTrail.model.script.ScriptEffect;
+import com.gpl.rpg.AndorsTrail.util.ConstRange;
+import com.gpl.rpg.AndorsTrail.util.L;
 
 public final class ConversationController {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/GameRoundController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/GameRoundController.java
similarity index 90%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/GameRoundController.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/GameRoundController.java
index d7a5db894..698b64307 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/GameRoundController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/GameRoundController.java
@@ -1,10 +1,10 @@
-package com.gpl.rpg.AndorsTrail_beta1.controller;
+package com.gpl.rpg.AndorsTrail.controller;
 
-import com.gpl.rpg.AndorsTrail_beta1.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta1.controller.listeners.GameRoundListeners;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.MapObject;
-import com.gpl.rpg.AndorsTrail_beta1.util.TimedMessageTask;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.controller.listeners.GameRoundListeners;
+import com.gpl.rpg.AndorsTrail.model.map.MapObject;
+import com.gpl.rpg.AndorsTrail.util.TimedMessageTask;
 
 public final class GameRoundController implements TimedMessageTask.Callback {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/InputController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/InputController.java
similarity index 94%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/InputController.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/InputController.java
index 43f3f320a..954910297 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/InputController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/InputController.java
@@ -1,13 +1,13 @@
-package com.gpl.rpg.AndorsTrail_beta1.controller;
+package com.gpl.rpg.AndorsTrail.controller;
 
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.View.OnLongClickListener;
 
-import com.gpl.rpg.AndorsTrail_beta1.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta1.util.Coord;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.util.Coord;
 
 public final class InputController implements OnClickListener, OnLongClickListener{
 	private final ControllerContext controllers;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/ItemController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ItemController.java
similarity index 93%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/ItemController.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ItemController.java
index e79c7fc23..2f8f58b61 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/ItemController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ItemController.java
@@ -1,24 +1,24 @@
-package com.gpl.rpg.AndorsTrail_beta1.controller;
+package com.gpl.rpg.AndorsTrail.controller;
 
 import java.util.ArrayList;
 import java.util.Collection;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailPreferences;
-import com.gpl.rpg.AndorsTrail_beta1.R;
-import com.gpl.rpg.AndorsTrail_beta1.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta1.controller.listeners.QuickSlotListeners;
-import com.gpl.rpg.AndorsTrail_beta1.model.ModelContainer;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.SkillCollection;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.traits.AbilityModifierTraits;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Player;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.Inventory;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemContainer;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemContainer.ItemEntry;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemTraits_OnHitReceived;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemTraits_OnUse;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemType;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.Loot;
+import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.controller.listeners.QuickSlotListeners;
+import com.gpl.rpg.AndorsTrail.model.ModelContainer;
+import com.gpl.rpg.AndorsTrail.model.ability.SkillCollection;
+import com.gpl.rpg.AndorsTrail.model.ability.traits.AbilityModifierTraits;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.model.item.Inventory;
+import com.gpl.rpg.AndorsTrail.model.item.ItemContainer;
+import com.gpl.rpg.AndorsTrail.model.item.ItemContainer.ItemEntry;
+import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnHitReceived;
+import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnUse;
+import com.gpl.rpg.AndorsTrail.model.item.ItemType;
+import com.gpl.rpg.AndorsTrail.model.item.Loot;
 
 import static java.lang.Math.min;
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/MapController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MapController.java
similarity index 90%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/MapController.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MapController.java
index c36f1b5a0..3d3eb7dfc 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/MapController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MapController.java
@@ -1,23 +1,23 @@
-package com.gpl.rpg.AndorsTrail_beta1.controller;
+package com.gpl.rpg.AndorsTrail.controller;
 
 import java.util.List;
 
 import android.content.res.Resources;
 
-import com.gpl.rpg.AndorsTrail_beta1.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta1.controller.listeners.MapLayoutListeners;
-import com.gpl.rpg.AndorsTrail_beta1.controller.listeners.WorldEventListeners;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.SkillCollection;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Actor;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Monster;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Player;
-import com.gpl.rpg.AndorsTrail_beta1.model.conversation.Reply;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.LayeredTileMap;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.MapObject;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.PredefinedMap;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.ReplaceableMapSection;
-import com.gpl.rpg.AndorsTrail_beta1.util.Coord;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.controller.listeners.MapLayoutListeners;
+import com.gpl.rpg.AndorsTrail.controller.listeners.WorldEventListeners;
+import com.gpl.rpg.AndorsTrail.model.ability.SkillCollection;
+import com.gpl.rpg.AndorsTrail.model.actor.Actor;
+import com.gpl.rpg.AndorsTrail.model.actor.Monster;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.model.conversation.Reply;
+import com.gpl.rpg.AndorsTrail.model.map.LayeredTileMap;
+import com.gpl.rpg.AndorsTrail.model.map.MapObject;
+import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
+import com.gpl.rpg.AndorsTrail.model.map.ReplaceableMapSection;
+import com.gpl.rpg.AndorsTrail.util.Coord;
 
 public final class MapController {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/MonsterMovementController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MonsterMovementController.java
similarity index 88%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/MonsterMovementController.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MonsterMovementController.java
index 8aea4a3bf..68fe6bde9 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/MonsterMovementController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MonsterMovementController.java
@@ -1,18 +1,18 @@
-package com.gpl.rpg.AndorsTrail_beta1.controller;
+package com.gpl.rpg.AndorsTrail.controller;
 
-import com.gpl.rpg.AndorsTrail_beta1.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta1.controller.PathFinder.EvaluateWalkable;
-import com.gpl.rpg.AndorsTrail_beta1.controller.listeners.MonsterMovementListeners;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.SkillCollection;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Monster;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.MonsterType;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.LayeredTileMap;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.MapObject;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.MonsterSpawnArea;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.PredefinedMap;
-import com.gpl.rpg.AndorsTrail_beta1.util.Coord;
-import com.gpl.rpg.AndorsTrail_beta1.util.CoordRect;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.controller.PathFinder.EvaluateWalkable;
+import com.gpl.rpg.AndorsTrail.controller.listeners.MonsterMovementListeners;
+import com.gpl.rpg.AndorsTrail.model.ability.SkillCollection;
+import com.gpl.rpg.AndorsTrail.model.actor.Monster;
+import com.gpl.rpg.AndorsTrail.model.actor.MonsterType;
+import com.gpl.rpg.AndorsTrail.model.map.LayeredTileMap;
+import com.gpl.rpg.AndorsTrail.model.map.MapObject;
+import com.gpl.rpg.AndorsTrail.model.map.MonsterSpawnArea;
+import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
+import com.gpl.rpg.AndorsTrail.util.Coord;
+import com.gpl.rpg.AndorsTrail.util.CoordRect;
 
 public final class MonsterMovementController implements EvaluateWalkable {
 	private final ControllerContext controllers;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/MonsterSpawningController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MonsterSpawningController.java
similarity index 82%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/MonsterSpawningController.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MonsterSpawningController.java
index d0bb2603f..969bab4e1 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/MonsterSpawningController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MonsterSpawningController.java
@@ -1,16 +1,16 @@
-package com.gpl.rpg.AndorsTrail_beta1.controller;
+package com.gpl.rpg.AndorsTrail.controller;
 
-import com.gpl.rpg.AndorsTrail_beta1.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta1.controller.listeners.MonsterSpawnListeners;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Monster;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.MonsterType;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.LayeredTileMap;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.MonsterSpawnArea;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.PredefinedMap;
-import com.gpl.rpg.AndorsTrail_beta1.util.Coord;
-import com.gpl.rpg.AndorsTrail_beta1.util.CoordRect;
-import com.gpl.rpg.AndorsTrail_beta1.util.Size;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.controller.listeners.MonsterSpawnListeners;
+import com.gpl.rpg.AndorsTrail.model.actor.Monster;
+import com.gpl.rpg.AndorsTrail.model.actor.MonsterType;
+import com.gpl.rpg.AndorsTrail.model.map.LayeredTileMap;
+import com.gpl.rpg.AndorsTrail.model.map.MonsterSpawnArea;
+import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
+import com.gpl.rpg.AndorsTrail.util.Coord;
+import com.gpl.rpg.AndorsTrail.util.CoordRect;
+import com.gpl.rpg.AndorsTrail.util.Size;
 
 public final class MonsterSpawningController {
 	private final ControllerContext controllers;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/MovementController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MovementController.java
similarity index 92%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/MovementController.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MovementController.java
index 89409ac5a..c99f8cab6 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/MovementController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MovementController.java
@@ -1,26 +1,26 @@
-package com.gpl.rpg.AndorsTrail_beta1.controller;
+package com.gpl.rpg.AndorsTrail.controller;
 
 import android.content.res.Resources;
 import android.os.AsyncTask;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailPreferences;
-import com.gpl.rpg.AndorsTrail_beta1.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta1.controller.listeners.PlayerMovementListeners;
-import com.gpl.rpg.AndorsTrail_beta1.model.MapBundle;
-import com.gpl.rpg.AndorsTrail_beta1.model.ModelContainer;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Monster;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Player;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.Loot;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.LayeredTileMap;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.MapObject;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.MonsterSpawnArea;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.PredefinedMap;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.TMXMapTranslator;
-import com.gpl.rpg.AndorsTrail_beta1.resource.tiles.TileCollection;
-import com.gpl.rpg.AndorsTrail_beta1.util.Coord;
-import com.gpl.rpg.AndorsTrail_beta1.util.L;
-import com.gpl.rpg.AndorsTrail_beta1.util.TimedMessageTask;
+import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.controller.listeners.PlayerMovementListeners;
+import com.gpl.rpg.AndorsTrail.model.MapBundle;
+import com.gpl.rpg.AndorsTrail.model.ModelContainer;
+import com.gpl.rpg.AndorsTrail.model.actor.Monster;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.model.item.Loot;
+import com.gpl.rpg.AndorsTrail.model.map.LayeredTileMap;
+import com.gpl.rpg.AndorsTrail.model.map.MapObject;
+import com.gpl.rpg.AndorsTrail.model.map.MonsterSpawnArea;
+import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
+import com.gpl.rpg.AndorsTrail.model.map.TMXMapTranslator;
+import com.gpl.rpg.AndorsTrail.resource.tiles.TileCollection;
+import com.gpl.rpg.AndorsTrail.util.Coord;
+import com.gpl.rpg.AndorsTrail.util.L;
+import com.gpl.rpg.AndorsTrail.util.TimedMessageTask;
 
 public final class MovementController implements TimedMessageTask.Callback {
 	private final ControllerContext controllers;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/PathFinder.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/PathFinder.java
similarity index 94%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/PathFinder.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/PathFinder.java
index 5a7306a51..e82f46303 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/PathFinder.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/PathFinder.java
@@ -1,10 +1,10 @@
-package com.gpl.rpg.AndorsTrail_beta1.controller;
+package com.gpl.rpg.AndorsTrail.controller;
 
 import java.util.Arrays;
 
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Monster;
-import com.gpl.rpg.AndorsTrail_beta1.util.Coord;
-import com.gpl.rpg.AndorsTrail_beta1.util.CoordRect;
+import com.gpl.rpg.AndorsTrail.model.actor.Monster;
+import com.gpl.rpg.AndorsTrail.util.Coord;
+import com.gpl.rpg.AndorsTrail.util.CoordRect;
 
 public class PathFinder {
 	private final int maxWidth;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/SkillController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/SkillController.java
similarity index 95%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/SkillController.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/SkillController.java
index 0a4541f5f..013830d56 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/SkillController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/SkillController.java
@@ -1,22 +1,22 @@
-package com.gpl.rpg.AndorsTrail_beta1.controller;
+package com.gpl.rpg.AndorsTrail.controller;
 
-import com.gpl.rpg.AndorsTrail_beta1.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta1.controller.listeners.CombatActionListeners;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.ActorConditionEffect;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.ActorConditionType;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.SkillCollection;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.SkillCollection.SkillID;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.SkillInfo;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Actor;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Monster;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Player;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.DropList.DropItem;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.Inventory;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemCategory;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemType;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemTypeCollection;
-import com.gpl.rpg.AndorsTrail_beta1.util.ConstRange;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.controller.listeners.CombatActionListeners;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionEffect;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionType;
+import com.gpl.rpg.AndorsTrail.model.ability.SkillCollection;
+import com.gpl.rpg.AndorsTrail.model.ability.SkillCollection.SkillID;
+import com.gpl.rpg.AndorsTrail.model.ability.SkillInfo;
+import com.gpl.rpg.AndorsTrail.model.actor.Actor;
+import com.gpl.rpg.AndorsTrail.model.actor.Monster;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.model.item.DropList.DropItem;
+import com.gpl.rpg.AndorsTrail.model.item.Inventory;
+import com.gpl.rpg.AndorsTrail.model.item.ItemCategory;
+import com.gpl.rpg.AndorsTrail.model.item.ItemType;
+import com.gpl.rpg.AndorsTrail.model.item.ItemTypeCollection;
+import com.gpl.rpg.AndorsTrail.util.ConstRange;
 
 public final class SkillController {
 	private final ControllerContext controllers;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/VisualEffectController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/VisualEffectController.java
similarity index 89%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/VisualEffectController.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/VisualEffectController.java
index d1c2b759f..8af21936a 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/VisualEffectController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/VisualEffectController.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.controller;
+package com.gpl.rpg.AndorsTrail.controller;
 
 import android.graphics.Color;
 import android.graphics.Paint;
@@ -6,20 +6,20 @@ import android.graphics.Paint.Align;
 import android.graphics.Rect;
 import android.os.Handler;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailPreferences;
-import com.gpl.rpg.AndorsTrail_beta1.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta1.controller.listeners.VisualEffectFrameListeners;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Actor;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Monster;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.MonsterType;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.PredefinedMap;
-import com.gpl.rpg.AndorsTrail_beta1.resource.VisualEffectCollection;
-import com.gpl.rpg.AndorsTrail_beta1.resource.VisualEffectCollection.VisualEffect;
-import com.gpl.rpg.AndorsTrail_beta1.resource.tiles.TileManager;
-import com.gpl.rpg.AndorsTrail_beta1.util.Coord;
-import com.gpl.rpg.AndorsTrail_beta1.util.CoordRect;
-import com.gpl.rpg.AndorsTrail_beta1.util.Size;
+import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.controller.listeners.VisualEffectFrameListeners;
+import com.gpl.rpg.AndorsTrail.model.actor.Actor;
+import com.gpl.rpg.AndorsTrail.model.actor.Monster;
+import com.gpl.rpg.AndorsTrail.model.actor.MonsterType;
+import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
+import com.gpl.rpg.AndorsTrail.resource.VisualEffectCollection;
+import com.gpl.rpg.AndorsTrail.resource.VisualEffectCollection.VisualEffect;
+import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
+import com.gpl.rpg.AndorsTrail.util.Coord;
+import com.gpl.rpg.AndorsTrail.util.CoordRect;
+import com.gpl.rpg.AndorsTrail.util.Size;
 
 public final class VisualEffectController {
 	private int effectCount = 0;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/WorldMapController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/WorldMapController.java
similarity index 92%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/WorldMapController.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/WorldMapController.java
index 9d32fc50d..d2d3ff200 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/WorldMapController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/WorldMapController.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.controller;
+package com.gpl.rpg.AndorsTrail.controller;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -18,22 +18,22 @@ import android.graphics.Paint;
 import android.os.AsyncTask;
 import android.widget.Toast;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta1.R;
-import com.gpl.rpg.AndorsTrail_beta1.activity.DisplayWorldMapActivity;
-import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.LayeredTileMap;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.MapLayer;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.PredefinedMap;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.WorldMapSegment;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.WorldMapSegment.NamedWorldMapArea;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.WorldMapSegment.WorldMapSegmentMap;
-import com.gpl.rpg.AndorsTrail_beta1.resource.tiles.TileCollection;
-import com.gpl.rpg.AndorsTrail_beta1.util.AndroidStorage;
-import com.gpl.rpg.AndorsTrail_beta1.util.Coord;
-import com.gpl.rpg.AndorsTrail_beta1.util.CoordRect;
-import com.gpl.rpg.AndorsTrail_beta1.util.L;
-import com.gpl.rpg.AndorsTrail_beta1.util.Size;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.activity.DisplayWorldMapActivity;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.model.map.LayeredTileMap;
+import com.gpl.rpg.AndorsTrail.model.map.MapLayer;
+import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
+import com.gpl.rpg.AndorsTrail.model.map.WorldMapSegment;
+import com.gpl.rpg.AndorsTrail.model.map.WorldMapSegment.NamedWorldMapArea;
+import com.gpl.rpg.AndorsTrail.model.map.WorldMapSegment.WorldMapSegmentMap;
+import com.gpl.rpg.AndorsTrail.resource.tiles.TileCollection;
+import com.gpl.rpg.AndorsTrail.util.AndroidStorage;
+import com.gpl.rpg.AndorsTrail.util.Coord;
+import com.gpl.rpg.AndorsTrail.util.CoordRect;
+import com.gpl.rpg.AndorsTrail.util.L;
+import com.gpl.rpg.AndorsTrail.util.Size;
 
 public final class WorldMapController {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/ActorConditionListener.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/ActorConditionListener.java
similarity index 79%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/ActorConditionListener.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/ActorConditionListener.java
index e7cb96246..c79a8e76d 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/ActorConditionListener.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/ActorConditionListener.java
@@ -1,7 +1,7 @@
-package com.gpl.rpg.AndorsTrail_beta1.controller.listeners;
+package com.gpl.rpg.AndorsTrail.controller.listeners;
 
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.ActorCondition;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Actor;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorCondition;
+import com.gpl.rpg.AndorsTrail.model.actor.Actor;
 
 public interface ActorConditionListener {
 	public void onActorConditionAdded(Actor actor, ActorCondition condition);
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/ActorConditionListeners.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/ActorConditionListeners.java
similarity index 94%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/ActorConditionListeners.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/ActorConditionListeners.java
index fc9c16413..ce2df663c 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/ActorConditionListeners.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/ActorConditionListeners.java
@@ -1,8 +1,8 @@
-package com.gpl.rpg.AndorsTrail_beta1.controller.listeners;
+package com.gpl.rpg.AndorsTrail.controller.listeners;
 
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.ActorCondition;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Actor;
-import com.gpl.rpg.AndorsTrail_beta1.util.ListOfListeners;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorCondition;
+import com.gpl.rpg.AndorsTrail.model.actor.Actor;
+import com.gpl.rpg.AndorsTrail.util.ListOfListeners;
 
 public final class ActorConditionListeners extends ListOfListeners<ActorConditionListener> implements ActorConditionListener {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/ActorStatsListener.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/ActorStatsListener.java
similarity index 68%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/ActorStatsListener.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/ActorStatsListener.java
index 8f825dad3..a010bc199 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/ActorStatsListener.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/ActorStatsListener.java
@@ -1,7 +1,7 @@
-package com.gpl.rpg.AndorsTrail_beta1.controller.listeners;
+package com.gpl.rpg.AndorsTrail.controller.listeners;
 
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Actor;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.model.actor.Actor;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
 
 public interface ActorStatsListener {
 	void onActorHealthChanged(Actor actor);
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/ActorStatsListeners.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/ActorStatsListeners.java
similarity index 91%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/ActorStatsListeners.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/ActorStatsListeners.java
index 1416635d8..85fe9dc46 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/ActorStatsListeners.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/ActorStatsListeners.java
@@ -1,8 +1,8 @@
-package com.gpl.rpg.AndorsTrail_beta1.controller.listeners;
+package com.gpl.rpg.AndorsTrail.controller.listeners;
 
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Actor;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Player;
-import com.gpl.rpg.AndorsTrail_beta1.util.ListOfListeners;
+import com.gpl.rpg.AndorsTrail.model.actor.Actor;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.util.ListOfListeners;
 
 public final class ActorStatsListeners extends ListOfListeners<ActorStatsListener> implements ActorStatsListener {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/CombatActionListener.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/CombatActionListener.java
similarity index 74%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/CombatActionListener.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/CombatActionListener.java
index 349b7f032..3b8e4ac19 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/CombatActionListener.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/CombatActionListener.java
@@ -1,8 +1,8 @@
-package com.gpl.rpg.AndorsTrail_beta1.controller.listeners;
+package com.gpl.rpg.AndorsTrail.controller.listeners;
 
-import com.gpl.rpg.AndorsTrail_beta1.controller.AttackResult;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.ActorConditionEffect;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Monster;
+import com.gpl.rpg.AndorsTrail.controller.AttackResult;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionEffect;
+import com.gpl.rpg.AndorsTrail.model.actor.Monster;
 
 public interface CombatActionListener {
 	void onPlayerAttackMissed(Monster target, AttackResult attackResult);
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/CombatActionListeners.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/CombatActionListeners.java
similarity index 94%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/CombatActionListeners.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/CombatActionListeners.java
index defbdc5b0..1a931bc27 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/CombatActionListeners.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/CombatActionListeners.java
@@ -1,9 +1,9 @@
-package com.gpl.rpg.AndorsTrail_beta1.controller.listeners;
+package com.gpl.rpg.AndorsTrail.controller.listeners;
 
-import com.gpl.rpg.AndorsTrail_beta1.controller.AttackResult;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.ActorConditionEffect;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Monster;
-import com.gpl.rpg.AndorsTrail_beta1.util.ListOfListeners;
+import com.gpl.rpg.AndorsTrail.controller.AttackResult;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionEffect;
+import com.gpl.rpg.AndorsTrail.model.actor.Monster;
+import com.gpl.rpg.AndorsTrail.util.ListOfListeners;
 
 public final class CombatActionListeners extends ListOfListeners<CombatActionListener> implements CombatActionListener {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/CombatSelectionListener.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/CombatSelectionListener.java
similarity index 62%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/CombatSelectionListener.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/CombatSelectionListener.java
index 7253ec19e..740ce25af 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/CombatSelectionListener.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/CombatSelectionListener.java
@@ -1,7 +1,7 @@
-package com.gpl.rpg.AndorsTrail_beta1.controller.listeners;
+package com.gpl.rpg.AndorsTrail.controller.listeners;
 
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Monster;
-import com.gpl.rpg.AndorsTrail_beta1.util.Coord;
+import com.gpl.rpg.AndorsTrail.model.actor.Monster;
+import com.gpl.rpg.AndorsTrail.util.Coord;
 
 public interface CombatSelectionListener {
 	void onMonsterSelected(Monster m, Coord selectedPosition, Coord previousSelection);
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/CombatSelectionListeners.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/CombatSelectionListeners.java
similarity index 88%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/CombatSelectionListeners.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/CombatSelectionListeners.java
index ef43b5a4c..2a72058e4 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/CombatSelectionListeners.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/CombatSelectionListeners.java
@@ -1,8 +1,8 @@
-package com.gpl.rpg.AndorsTrail_beta1.controller.listeners;
+package com.gpl.rpg.AndorsTrail.controller.listeners;
 
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Monster;
-import com.gpl.rpg.AndorsTrail_beta1.util.Coord;
-import com.gpl.rpg.AndorsTrail_beta1.util.ListOfListeners;
+import com.gpl.rpg.AndorsTrail.model.actor.Monster;
+import com.gpl.rpg.AndorsTrail.util.Coord;
+import com.gpl.rpg.AndorsTrail.util.ListOfListeners;
 
 public final class CombatSelectionListeners extends ListOfListeners<CombatSelectionListener> implements CombatSelectionListener {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/CombatTurnListener.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/CombatTurnListener.java
similarity index 56%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/CombatTurnListener.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/CombatTurnListener.java
index f8e49c0c8..a24964184 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/CombatTurnListener.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/CombatTurnListener.java
@@ -1,6 +1,6 @@
-package com.gpl.rpg.AndorsTrail_beta1.controller.listeners;
+package com.gpl.rpg.AndorsTrail.controller.listeners;
 
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Monster;
+import com.gpl.rpg.AndorsTrail.model.actor.Monster;
 
 public interface CombatTurnListener {
 	void onCombatStarted();
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/CombatTurnListeners.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/CombatTurnListeners.java
similarity index 88%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/CombatTurnListeners.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/CombatTurnListeners.java
index 6239c6120..a836fdfe8 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/CombatTurnListeners.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/CombatTurnListeners.java
@@ -1,7 +1,7 @@
-package com.gpl.rpg.AndorsTrail_beta1.controller.listeners;
+package com.gpl.rpg.AndorsTrail.controller.listeners;
 
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Monster;
-import com.gpl.rpg.AndorsTrail_beta1.util.ListOfListeners;
+import com.gpl.rpg.AndorsTrail.model.actor.Monster;
+import com.gpl.rpg.AndorsTrail.util.ListOfListeners;
 
 public final class CombatTurnListeners extends ListOfListeners<CombatTurnListener> implements CombatTurnListener {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/GameRoundListener.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/GameRoundListener.java
similarity index 63%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/GameRoundListener.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/GameRoundListener.java
index 8a591ebb5..de8161e3a 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/GameRoundListener.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/GameRoundListener.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.controller.listeners;
+package com.gpl.rpg.AndorsTrail.controller.listeners;
 
 public interface GameRoundListener {
 	void onNewTick();
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/GameRoundListeners.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/GameRoundListeners.java
similarity index 88%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/GameRoundListeners.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/GameRoundListeners.java
index 42591b13b..8a1d777c4 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/GameRoundListeners.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/GameRoundListeners.java
@@ -1,6 +1,6 @@
-package com.gpl.rpg.AndorsTrail_beta1.controller.listeners;
+package com.gpl.rpg.AndorsTrail.controller.listeners;
 
-import com.gpl.rpg.AndorsTrail_beta1.util.ListOfListeners;
+import com.gpl.rpg.AndorsTrail.util.ListOfListeners;
 
 public final class GameRoundListeners extends ListOfListeners<GameRoundListener> implements GameRoundListener {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/MapLayoutListener.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/MapLayoutListener.java
new file mode 100644
index 000000000..897e6eb9a
--- /dev/null
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/MapLayoutListener.java
@@ -0,0 +1,11 @@
+package com.gpl.rpg.AndorsTrail.controller.listeners;
+
+import com.gpl.rpg.AndorsTrail.model.map.LayeredTileMap;
+import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
+import com.gpl.rpg.AndorsTrail.util.Coord;
+
+public interface MapLayoutListener {
+	void onLootBagCreated(PredefinedMap map, Coord p);
+	void onLootBagRemoved(PredefinedMap map, Coord p);
+	void onMapTilesChanged(PredefinedMap map, LayeredTileMap tileMap);
+}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/MapLayoutListeners.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/MapLayoutListeners.java
similarity index 82%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/MapLayoutListeners.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/MapLayoutListeners.java
index 67cff6a71..ec290997a 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/MapLayoutListeners.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/MapLayoutListeners.java
@@ -1,9 +1,9 @@
-package com.gpl.rpg.AndorsTrail_beta1.controller.listeners;
+package com.gpl.rpg.AndorsTrail.controller.listeners;
 
-import com.gpl.rpg.AndorsTrail_beta1.model.map.LayeredTileMap;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.PredefinedMap;
-import com.gpl.rpg.AndorsTrail_beta1.util.Coord;
-import com.gpl.rpg.AndorsTrail_beta1.util.ListOfListeners;
+import com.gpl.rpg.AndorsTrail.model.map.LayeredTileMap;
+import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
+import com.gpl.rpg.AndorsTrail.util.Coord;
+import com.gpl.rpg.AndorsTrail.util.ListOfListeners;
 
 public final class MapLayoutListeners extends ListOfListeners<MapLayoutListener> implements MapLayoutListener {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/MonsterMovementListener.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/MonsterMovementListener.java
new file mode 100644
index 000000000..48d7173f7
--- /dev/null
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/MonsterMovementListener.java
@@ -0,0 +1,10 @@
+package com.gpl.rpg.AndorsTrail.controller.listeners;
+
+import com.gpl.rpg.AndorsTrail.model.actor.Monster;
+import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
+import com.gpl.rpg.AndorsTrail.util.CoordRect;
+
+public interface MonsterMovementListener {
+	void onMonsterSteppedOnPlayer(Monster m);
+	void onMonsterMoved(PredefinedMap map, Monster m, CoordRect previousPosition);
+}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/MonsterMovementListeners.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/MonsterMovementListeners.java
similarity index 78%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/MonsterMovementListeners.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/MonsterMovementListeners.java
index d6348611c..55f6e86e0 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/MonsterMovementListeners.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/MonsterMovementListeners.java
@@ -1,9 +1,9 @@
-package com.gpl.rpg.AndorsTrail_beta1.controller.listeners;
+package com.gpl.rpg.AndorsTrail.controller.listeners;
 
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Monster;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.PredefinedMap;
-import com.gpl.rpg.AndorsTrail_beta1.util.CoordRect;
-import com.gpl.rpg.AndorsTrail_beta1.util.ListOfListeners;
+import com.gpl.rpg.AndorsTrail.model.actor.Monster;
+import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
+import com.gpl.rpg.AndorsTrail.util.CoordRect;
+import com.gpl.rpg.AndorsTrail.util.ListOfListeners;
 
 public final class MonsterMovementListeners extends ListOfListeners<MonsterMovementListener> implements MonsterMovementListener {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/MonsterSpawnListener.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/MonsterSpawnListener.java
similarity index 54%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/MonsterSpawnListener.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/MonsterSpawnListener.java
index 36f5beb13..5892af823 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/MonsterSpawnListener.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/MonsterSpawnListener.java
@@ -1,9 +1,9 @@
-package com.gpl.rpg.AndorsTrail_beta1.controller.listeners;
+package com.gpl.rpg.AndorsTrail.controller.listeners;
 
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Monster;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.PredefinedMap;
-import com.gpl.rpg.AndorsTrail_beta1.util.Coord;
-import com.gpl.rpg.AndorsTrail_beta1.util.CoordRect;
+import com.gpl.rpg.AndorsTrail.model.actor.Monster;
+import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
+import com.gpl.rpg.AndorsTrail.util.Coord;
+import com.gpl.rpg.AndorsTrail.util.CoordRect;
 
 public interface MonsterSpawnListener {
 	void onMonsterSpawned(PredefinedMap map, Monster m);
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/MonsterSpawnListeners.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/MonsterSpawnListeners.java
similarity index 87%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/MonsterSpawnListeners.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/MonsterSpawnListeners.java
index 0ac48af28..e1cb0e919 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/MonsterSpawnListeners.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/MonsterSpawnListeners.java
@@ -1,10 +1,10 @@
-package com.gpl.rpg.AndorsTrail_beta1.controller.listeners;
+package com.gpl.rpg.AndorsTrail.controller.listeners;
 
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Monster;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.PredefinedMap;
-import com.gpl.rpg.AndorsTrail_beta1.util.Coord;
-import com.gpl.rpg.AndorsTrail_beta1.util.CoordRect;
-import com.gpl.rpg.AndorsTrail_beta1.util.ListOfListeners;
+import com.gpl.rpg.AndorsTrail.model.actor.Monster;
+import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
+import com.gpl.rpg.AndorsTrail.util.Coord;
+import com.gpl.rpg.AndorsTrail.util.CoordRect;
+import com.gpl.rpg.AndorsTrail.util.ListOfListeners;
 
 public final class MonsterSpawnListeners extends ListOfListeners<MonsterSpawnListener> implements MonsterSpawnListener {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/PlayerMovementListener.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/PlayerMovementListener.java
similarity index 52%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/PlayerMovementListener.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/PlayerMovementListener.java
index 9a2726c51..3f6a53d73 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/PlayerMovementListener.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/PlayerMovementListener.java
@@ -1,7 +1,7 @@
-package com.gpl.rpg.AndorsTrail_beta1.controller.listeners;
+package com.gpl.rpg.AndorsTrail.controller.listeners;
 
-import com.gpl.rpg.AndorsTrail_beta1.model.map.PredefinedMap;
-import com.gpl.rpg.AndorsTrail_beta1.util.Coord;
+import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
+import com.gpl.rpg.AndorsTrail.util.Coord;
 
 public interface PlayerMovementListener {
 	void onPlayerMoved(PredefinedMap map, Coord newPosition, Coord previousPosition);
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/PlayerMovementListeners.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/PlayerMovementListeners.java
similarity index 82%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/PlayerMovementListeners.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/PlayerMovementListeners.java
index e4bf08825..739ae13fb 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/PlayerMovementListeners.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/PlayerMovementListeners.java
@@ -1,8 +1,8 @@
-package com.gpl.rpg.AndorsTrail_beta1.controller.listeners;
+package com.gpl.rpg.AndorsTrail.controller.listeners;
 
-import com.gpl.rpg.AndorsTrail_beta1.model.map.PredefinedMap;
-import com.gpl.rpg.AndorsTrail_beta1.util.Coord;
-import com.gpl.rpg.AndorsTrail_beta1.util.ListOfListeners;
+import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
+import com.gpl.rpg.AndorsTrail.util.Coord;
+import com.gpl.rpg.AndorsTrail.util.ListOfListeners;
 
 public final class PlayerMovementListeners extends ListOfListeners<PlayerMovementListener> implements PlayerMovementListener {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/PlayerStatsListener.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/PlayerStatsListener.java
new file mode 100644
index 000000000..7f8942ceb
--- /dev/null
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/PlayerStatsListener.java
@@ -0,0 +1,7 @@
+package com.gpl.rpg.AndorsTrail.controller.listeners;
+
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
+
+public interface PlayerStatsListener {
+	void onPlayerExperienceChanged(Player p);
+}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/PlayerStatsListeners.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/PlayerStatsListeners.java
similarity index 73%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/PlayerStatsListeners.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/PlayerStatsListeners.java
index 2426c61e9..73f944930 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/PlayerStatsListeners.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/PlayerStatsListeners.java
@@ -1,7 +1,7 @@
-package com.gpl.rpg.AndorsTrail_beta1.controller.listeners;
+package com.gpl.rpg.AndorsTrail.controller.listeners;
 
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Player;
-import com.gpl.rpg.AndorsTrail_beta1.util.ListOfListeners;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.util.ListOfListeners;
 
 public final class PlayerStatsListeners extends ListOfListeners<PlayerStatsListener> implements PlayerStatsListener {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/QuickSlotListener.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/QuickSlotListener.java
similarity index 65%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/QuickSlotListener.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/QuickSlotListener.java
index 536267853..0ce5b14e4 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/QuickSlotListener.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/QuickSlotListener.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.controller.listeners;
+package com.gpl.rpg.AndorsTrail.controller.listeners;
 
 public interface QuickSlotListener {
 	void onQuickSlotChanged(int slotId);
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/QuickSlotListeners.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/QuickSlotListeners.java
similarity index 87%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/QuickSlotListeners.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/QuickSlotListeners.java
index 1f845da4f..19b2d2793 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/QuickSlotListeners.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/QuickSlotListeners.java
@@ -1,6 +1,6 @@
-package com.gpl.rpg.AndorsTrail_beta1.controller.listeners;
+package com.gpl.rpg.AndorsTrail.controller.listeners;
 
-import com.gpl.rpg.AndorsTrail_beta1.util.ListOfListeners;
+import com.gpl.rpg.AndorsTrail.util.ListOfListeners;
 
 public final class QuickSlotListeners extends ListOfListeners<QuickSlotListener> implements QuickSlotListener {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/VisualEffectFrameListener.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/VisualEffectFrameListener.java
similarity index 58%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/VisualEffectFrameListener.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/VisualEffectFrameListener.java
index 522bc09f2..34149225a 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/VisualEffectFrameListener.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/VisualEffectFrameListener.java
@@ -1,8 +1,8 @@
-package com.gpl.rpg.AndorsTrail_beta1.controller.listeners;
+package com.gpl.rpg.AndorsTrail.controller.listeners;
 
-import com.gpl.rpg.AndorsTrail_beta1.controller.VisualEffectController.SpriteMoveAnimation;
-import com.gpl.rpg.AndorsTrail_beta1.controller.VisualEffectController.VisualEffectAnimation;
-import com.gpl.rpg.AndorsTrail_beta1.util.CoordRect;
+import com.gpl.rpg.AndorsTrail.controller.VisualEffectController.SpriteMoveAnimation;
+import com.gpl.rpg.AndorsTrail.controller.VisualEffectController.VisualEffectAnimation;
+import com.gpl.rpg.AndorsTrail.util.CoordRect;
 
 public interface VisualEffectFrameListener {
 	void onNewAnimationFrame(VisualEffectAnimation animation, int tileID, int textYOffset);
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/VisualEffectFrameListeners.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/VisualEffectFrameListeners.java
similarity index 89%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/VisualEffectFrameListeners.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/VisualEffectFrameListeners.java
index 22f47ee44..cbeb221bb 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/VisualEffectFrameListeners.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/VisualEffectFrameListeners.java
@@ -1,9 +1,9 @@
-package com.gpl.rpg.AndorsTrail_beta1.controller.listeners;
+package com.gpl.rpg.AndorsTrail.controller.listeners;
 
-import com.gpl.rpg.AndorsTrail_beta1.controller.VisualEffectController.SpriteMoveAnimation;
-import com.gpl.rpg.AndorsTrail_beta1.controller.VisualEffectController.VisualEffectAnimation;
-import com.gpl.rpg.AndorsTrail_beta1.util.CoordRect;
-import com.gpl.rpg.AndorsTrail_beta1.util.ListOfListeners;
+import com.gpl.rpg.AndorsTrail.controller.VisualEffectController.SpriteMoveAnimation;
+import com.gpl.rpg.AndorsTrail.controller.VisualEffectController.VisualEffectAnimation;
+import com.gpl.rpg.AndorsTrail.util.CoordRect;
+import com.gpl.rpg.AndorsTrail.util.ListOfListeners;
 
 public final class VisualEffectFrameListeners extends ListOfListeners<VisualEffectFrameListener> implements VisualEffectFrameListener {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/WorldEventListener.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/WorldEventListener.java
similarity index 74%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/WorldEventListener.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/WorldEventListener.java
index f15d1def3..3c25ff3bd 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/WorldEventListener.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/WorldEventListener.java
@@ -1,10 +1,10 @@
-package com.gpl.rpg.AndorsTrail_beta1.controller.listeners;
+package com.gpl.rpg.AndorsTrail.controller.listeners;
 
 import java.util.Collection;
 
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Monster;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.Loot;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.MapObject;
+import com.gpl.rpg.AndorsTrail.model.actor.Monster;
+import com.gpl.rpg.AndorsTrail.model.item.Loot;
+import com.gpl.rpg.AndorsTrail.model.map.MapObject;
 
 public interface WorldEventListener {
 	void onPlayerStartedConversation(Monster m, String phraseID);
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/WorldEventListeners.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/WorldEventListeners.java
similarity index 94%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/WorldEventListeners.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/WorldEventListeners.java
index 7bb90cf75..dbb4a4f3a 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/WorldEventListeners.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/WorldEventListeners.java
@@ -1,11 +1,11 @@
-package com.gpl.rpg.AndorsTrail_beta1.controller.listeners;
+package com.gpl.rpg.AndorsTrail.controller.listeners;
 
 import java.util.Collection;
 
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Monster;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.Loot;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.MapObject;
-import com.gpl.rpg.AndorsTrail_beta1.util.ListOfListeners;
+import com.gpl.rpg.AndorsTrail.model.actor.Monster;
+import com.gpl.rpg.AndorsTrail.model.item.Loot;
+import com.gpl.rpg.AndorsTrail.model.map.MapObject;
+import com.gpl.rpg.AndorsTrail.util.ListOfListeners;
 
 public final class WorldEventListeners extends ListOfListeners<WorldEventListener> implements WorldEventListener {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/CombatLog.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/CombatLog.java
similarity index 96%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/CombatLog.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/CombatLog.java
index ecd86860a..1235fed95 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/CombatLog.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/CombatLog.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.model;
+package com.gpl.rpg.AndorsTrail.model;
 
 import java.util.LinkedList;
 import java.util.ListIterator;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/GameStatistics.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/GameStatistics.java
similarity index 94%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/GameStatistics.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/GameStatistics.java
index 31ecf1afb..515eb2fa0 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/GameStatistics.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/GameStatistics.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.model;
+package com.gpl.rpg.AndorsTrail.model;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
@@ -13,12 +13,12 @@ import java.util.Set;
 
 import android.content.res.Resources;
 
-import com.gpl.rpg.AndorsTrail_beta1.R;
-import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.MonsterType;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemType;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.PredefinedMap;
-import com.gpl.rpg.AndorsTrail_beta1.model.quest.Quest;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.model.actor.MonsterType;
+import com.gpl.rpg.AndorsTrail.model.item.ItemType;
+import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
+import com.gpl.rpg.AndorsTrail.model.quest.Quest;
 
 public final class GameStatistics {
 	private int deaths = 0;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/InterfaceData.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/InterfaceData.java
similarity index 91%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/InterfaceData.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/InterfaceData.java
index 4d2c0cb95..b595049a0 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/InterfaceData.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/InterfaceData.java
@@ -1,11 +1,11 @@
-package com.gpl.rpg.AndorsTrail_beta1.model;
+package com.gpl.rpg.AndorsTrail.model;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Monster;
-import com.gpl.rpg.AndorsTrail_beta1.util.Coord;
+import com.gpl.rpg.AndorsTrail.model.actor.Monster;
+import com.gpl.rpg.AndorsTrail.util.Coord;
 
 public final class InterfaceData {
 	public boolean isMainActivityVisible = false;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/MapBundle.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/MapBundle.java
new file mode 100644
index 000000000..fa102330f
--- /dev/null
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/MapBundle.java
@@ -0,0 +1,11 @@
+package com.gpl.rpg.AndorsTrail.model;
+
+import com.gpl.rpg.AndorsTrail.model.map.LayeredTileMap;
+import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
+import com.gpl.rpg.AndorsTrail.resource.tiles.TileCollection;
+
+public final class MapBundle {
+	public PredefinedMap map;
+	public LayeredTileMap tileMap;
+	public TileCollection tiles;
+}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/ModelContainer.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ModelContainer.java
similarity index 88%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/ModelContainer.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ModelContainer.java
index 35f3d031b..2be421d2a 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/ModelContainer.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ModelContainer.java
@@ -1,12 +1,12 @@
-package com.gpl.rpg.AndorsTrail_beta1.model;
+package com.gpl.rpg.AndorsTrail.model;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import com.gpl.rpg.AndorsTrail_beta1.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
 
 public final class ModelContainer {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/WorldData.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/WorldData.java
similarity index 97%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/WorldData.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/WorldData.java
index 850cb4c1b..f26e61a8b 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/WorldData.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/WorldData.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.model;
+package com.gpl.rpg.AndorsTrail.model;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/ability/ActorCondition.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/ActorCondition.java
similarity index 92%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/ability/ActorCondition.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/ActorCondition.java
index b3202faf4..94fee6a3c 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/ability/ActorCondition.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/ActorCondition.java
@@ -1,10 +1,10 @@
-package com.gpl.rpg.AndorsTrail_beta1.model.ability;
+package com.gpl.rpg.AndorsTrail.model.ability;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
 
 public final class ActorCondition {
 	public static final int MAGNITUDE_REMOVE_ALL = -99;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/ability/ActorConditionEffect.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/ActorConditionEffect.java
similarity index 89%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/ability/ActorConditionEffect.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/ActorConditionEffect.java
index c69687be2..2a5286e30 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/ability/ActorConditionEffect.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/ActorConditionEffect.java
@@ -1,6 +1,6 @@
-package com.gpl.rpg.AndorsTrail_beta1.model.ability;
+package com.gpl.rpg.AndorsTrail.model.ability;
 
-import com.gpl.rpg.AndorsTrail_beta1.util.ConstRange;
+import com.gpl.rpg.AndorsTrail.util.ConstRange;
 
 public final class ActorConditionEffect {
 	public final ActorConditionType conditionType;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/ability/ActorConditionType.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/ActorConditionType.java
similarity index 84%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/ability/ActorConditionType.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/ActorConditionType.java
index 0e0e2be53..f625a6101 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/ability/ActorConditionType.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/ActorConditionType.java
@@ -1,7 +1,7 @@
-package com.gpl.rpg.AndorsTrail_beta1.model.ability;
+package com.gpl.rpg.AndorsTrail.model.ability;
 
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.traits.AbilityModifierTraits;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.traits.StatsModifierTraits;
+import com.gpl.rpg.AndorsTrail.model.ability.traits.AbilityModifierTraits;
+import com.gpl.rpg.AndorsTrail.model.ability.traits.StatsModifierTraits;
 
 public final class ActorConditionType {
 	public static enum ConditionCategory {
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/ability/ActorConditionTypeCollection.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/ActorConditionTypeCollection.java
similarity index 76%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/ability/ActorConditionTypeCollection.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/ActorConditionTypeCollection.java
index 715d34795..fdd15111c 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/ability/ActorConditionTypeCollection.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/ActorConditionTypeCollection.java
@@ -1,10 +1,10 @@
-package com.gpl.rpg.AndorsTrail_beta1.model.ability;
+package com.gpl.rpg.AndorsTrail.model.ability;
 
 import java.util.HashMap;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta1.resource.parsers.ActorConditionsTypeParser;
-import com.gpl.rpg.AndorsTrail_beta1.util.L;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.resource.parsers.ActorConditionsTypeParser;
+import com.gpl.rpg.AndorsTrail.util.L;
 
 public final class ActorConditionTypeCollection {
 	private final HashMap<String, ActorConditionType> conditionTypes = new HashMap<String, ActorConditionType>();
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/ability/SkillCollection.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/SkillCollection.java
similarity index 98%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/ability/SkillCollection.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/SkillCollection.java
index c4d014bd3..53d28fd45 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/ability/SkillCollection.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/SkillCollection.java
@@ -1,12 +1,12 @@
-package com.gpl.rpg.AndorsTrail_beta1.model.ability;
+package com.gpl.rpg.AndorsTrail.model.ability;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedHashMap;
 
-import com.gpl.rpg.AndorsTrail_beta1.controller.Constants;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.SkillInfo.SkillLevelRequirement;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.controller.Constants;
+import com.gpl.rpg.AndorsTrail.model.ability.SkillInfo.SkillLevelRequirement;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
 
 public final class SkillCollection {
 	public static enum SkillID {
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/ability/SkillInfo.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/SkillInfo.java
similarity index 97%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/ability/SkillInfo.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/SkillInfo.java
index 50bc57d94..48b0a1081 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/ability/SkillInfo.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/SkillInfo.java
@@ -1,6 +1,6 @@
-package com.gpl.rpg.AndorsTrail_beta1.model.ability;
+package com.gpl.rpg.AndorsTrail.model.ability;
 
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
 
 public final class SkillInfo {
 	public static final int MAXLEVEL_NONE = -1;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/ability/traits/AbilityModifierTraits.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/traits/AbilityModifierTraits.java
similarity index 98%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/ability/traits/AbilityModifierTraits.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/traits/AbilityModifierTraits.java
index 50e51fb0b..7d7fdedd6 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/ability/traits/AbilityModifierTraits.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/traits/AbilityModifierTraits.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.model.ability.traits;
+package com.gpl.rpg.AndorsTrail.model.ability.traits;
 
 public final class AbilityModifierTraits {
 	public final int increaseMaxHP;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/ability/traits/StatsModifierTraits.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/traits/StatsModifierTraits.java
similarity index 90%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/ability/traits/StatsModifierTraits.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/traits/StatsModifierTraits.java
index b692cd8e3..59e1b59fc 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/ability/traits/StatsModifierTraits.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/traits/StatsModifierTraits.java
@@ -1,7 +1,7 @@
-package com.gpl.rpg.AndorsTrail_beta1.model.ability.traits;
+package com.gpl.rpg.AndorsTrail.model.ability.traits;
 
-import com.gpl.rpg.AndorsTrail_beta1.resource.VisualEffectCollection;
-import com.gpl.rpg.AndorsTrail_beta1.util.ConstRange;
+import com.gpl.rpg.AndorsTrail.resource.VisualEffectCollection;
+import com.gpl.rpg.AndorsTrail.util.ConstRange;
 
 public final class StatsModifierTraits {
 	public final VisualEffectCollection.VisualEffectID visualEffectID;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/actor/Actor.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Actor.java
similarity index 89%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/actor/Actor.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Actor.java
index 0a3d4a810..d91ae7d61 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/actor/Actor.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Actor.java
@@ -1,16 +1,16 @@
-package com.gpl.rpg.AndorsTrail_beta1.model.actor;
+package com.gpl.rpg.AndorsTrail.model.actor;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.ActorCondition;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemTraits_OnHitReceived;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemTraits_OnUse;
-import com.gpl.rpg.AndorsTrail_beta1.util.Coord;
-import com.gpl.rpg.AndorsTrail_beta1.util.CoordRect;
-import com.gpl.rpg.AndorsTrail_beta1.util.Range;
-import com.gpl.rpg.AndorsTrail_beta1.util.Size;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorCondition;
+import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnHitReceived;
+import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnUse;
+import com.gpl.rpg.AndorsTrail.util.Coord;
+import com.gpl.rpg.AndorsTrail.util.CoordRect;
+import com.gpl.rpg.AndorsTrail.util.Range;
+import com.gpl.rpg.AndorsTrail.util.Size;
 
 public class Actor {
 	public int iconID;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/actor/HeroCollection.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/HeroCollection.java
similarity index 92%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/actor/HeroCollection.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/HeroCollection.java
index 93253bdb0..9c3dd7459 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/actor/HeroCollection.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/HeroCollection.java
@@ -1,10 +1,10 @@
-package com.gpl.rpg.AndorsTrail_beta1.model.actor;
+package com.gpl.rpg.AndorsTrail.model.actor;
 
 import java.util.LinkedList;
 import java.util.List;
 
-import com.gpl.rpg.AndorsTrail_beta1.R;
-import com.gpl.rpg.AndorsTrail_beta1.resource.DynamicTileLoader;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.resource.DynamicTileLoader;
 
 public class HeroCollection {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/actor/Monster.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Monster.java
similarity index 88%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/actor/Monster.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Monster.java
index 3c393534a..0b65faa20 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/actor/Monster.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Monster.java
@@ -1,21 +1,21 @@
-package com.gpl.rpg.AndorsTrail_beta1.model.actor;
+package com.gpl.rpg.AndorsTrail.model.actor;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta1.controller.Constants;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.ActorCondition;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.SkillCollection;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.DropList;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemContainer;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.Loot;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.MonsterSpawnArea;
-import com.gpl.rpg.AndorsTrail_beta1.savegames.LegacySavegameFormatReaderForMonster;
-import com.gpl.rpg.AndorsTrail_beta1.util.Coord;
-import com.gpl.rpg.AndorsTrail_beta1.util.CoordRect;
-import com.gpl.rpg.AndorsTrail_beta1.util.Range;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.controller.Constants;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorCondition;
+import com.gpl.rpg.AndorsTrail.model.ability.SkillCollection;
+import com.gpl.rpg.AndorsTrail.model.item.DropList;
+import com.gpl.rpg.AndorsTrail.model.item.ItemContainer;
+import com.gpl.rpg.AndorsTrail.model.item.Loot;
+import com.gpl.rpg.AndorsTrail.model.map.MonsterSpawnArea;
+import com.gpl.rpg.AndorsTrail.savegames.LegacySavegameFormatReaderForMonster;
+import com.gpl.rpg.AndorsTrail.util.Coord;
+import com.gpl.rpg.AndorsTrail.util.CoordRect;
+import com.gpl.rpg.AndorsTrail.util.Range;
 
 public final class Monster extends Actor {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/actor/MonsterType.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/MonsterType.java
similarity index 91%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/actor/MonsterType.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/MonsterType.java
index 680a73db0..bfad037df 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/actor/MonsterType.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/MonsterType.java
@@ -1,10 +1,10 @@
-package com.gpl.rpg.AndorsTrail_beta1.model.actor;
+package com.gpl.rpg.AndorsTrail.model.actor;
 
-import com.gpl.rpg.AndorsTrail_beta1.model.item.DropList;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemTraits_OnHitReceived;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemTraits_OnUse;
-import com.gpl.rpg.AndorsTrail_beta1.util.ConstRange;
-import com.gpl.rpg.AndorsTrail_beta1.util.Size;
+import com.gpl.rpg.AndorsTrail.model.item.DropList;
+import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnHitReceived;
+import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnUse;
+import com.gpl.rpg.AndorsTrail.util.ConstRange;
+import com.gpl.rpg.AndorsTrail.util.Size;
 
 public final class MonsterType {
 	public static enum MonsterClass {
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/actor/MonsterTypeCollection.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/MonsterTypeCollection.java
similarity index 84%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/actor/MonsterTypeCollection.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/MonsterTypeCollection.java
index ef3dc9815..870afcfba 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/actor/MonsterTypeCollection.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/MonsterTypeCollection.java
@@ -1,11 +1,11 @@
-package com.gpl.rpg.AndorsTrail_beta1.model.actor;
+package com.gpl.rpg.AndorsTrail.model.actor;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta1.resource.parsers.MonsterTypeParser;
-import com.gpl.rpg.AndorsTrail_beta1.util.L;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.resource.parsers.MonsterTypeParser;
+import com.gpl.rpg.AndorsTrail.util.L;
 
 public final class MonsterTypeCollection {
 	private final HashMap<String, MonsterType> monsterTypesById = new HashMap<String, MonsterType>();
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/actor/Player.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Player.java
similarity index 94%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/actor/Player.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Player.java
index 328d03c82..67b2215c9 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/actor/Player.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Player.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.model.actor;
+package com.gpl.rpg.AndorsTrail.model.actor;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
@@ -15,21 +15,21 @@ import java.util.UUID;
 
 import android.util.SparseIntArray;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta1.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta1.controller.Constants;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.ActorCondition;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.SkillCollection;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.DropListCollection;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.Inventory;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.Loot;
-import com.gpl.rpg.AndorsTrail_beta1.model.quest.Quest;
-import com.gpl.rpg.AndorsTrail_beta1.model.quest.QuestProgress;
-import com.gpl.rpg.AndorsTrail_beta1.savegames.LegacySavegameFormatReaderForPlayer;
-import com.gpl.rpg.AndorsTrail_beta1.util.Coord;
-import com.gpl.rpg.AndorsTrail_beta1.util.Range;
-import com.gpl.rpg.AndorsTrail_beta1.util.Size;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.controller.Constants;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorCondition;
+import com.gpl.rpg.AndorsTrail.model.ability.SkillCollection;
+import com.gpl.rpg.AndorsTrail.model.item.DropListCollection;
+import com.gpl.rpg.AndorsTrail.model.item.Inventory;
+import com.gpl.rpg.AndorsTrail.model.item.Loot;
+import com.gpl.rpg.AndorsTrail.model.quest.Quest;
+import com.gpl.rpg.AndorsTrail.model.quest.QuestProgress;
+import com.gpl.rpg.AndorsTrail.savegames.LegacySavegameFormatReaderForPlayer;
+import com.gpl.rpg.AndorsTrail.util.Coord;
+import com.gpl.rpg.AndorsTrail.util.Range;
+import com.gpl.rpg.AndorsTrail.util.Size;
 
 public final class Player extends Actor {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/conversation/ConversationCollection.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/conversation/ConversationCollection.java
similarity index 81%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/conversation/ConversationCollection.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/conversation/ConversationCollection.java
index b4acbca59..97de49d44 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/conversation/ConversationCollection.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/conversation/ConversationCollection.java
@@ -1,11 +1,11 @@
-package com.gpl.rpg.AndorsTrail_beta1.model.conversation;
+package com.gpl.rpg.AndorsTrail.model.conversation;
 
 import java.util.Collection;
 import java.util.HashMap;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta1.resource.parsers.ConversationListParser;
-import com.gpl.rpg.AndorsTrail_beta1.util.L;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.resource.parsers.ConversationListParser;
+import com.gpl.rpg.AndorsTrail.util.L;
 
 public final class ConversationCollection {
 	public static final String PHRASE_CLOSE = "X";
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/conversation/Phrase.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/conversation/Phrase.java
similarity index 83%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/conversation/Phrase.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/conversation/Phrase.java
index 54bbe086f..fafce7e1d 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/conversation/Phrase.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/conversation/Phrase.java
@@ -1,6 +1,6 @@
-package com.gpl.rpg.AndorsTrail_beta1.model.conversation;
+package com.gpl.rpg.AndorsTrail.model.conversation;
 
-import com.gpl.rpg.AndorsTrail_beta1.model.script.ScriptEffect;
+import com.gpl.rpg.AndorsTrail.model.script.ScriptEffect;
 
 public final class Phrase {
 	private static final Reply[] NO_REPLIES = new Reply[0];
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/conversation/Reply.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/conversation/Reply.java
similarity index 75%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/conversation/Reply.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/conversation/Reply.java
index d5eb2643d..980791fc9 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/conversation/Reply.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/conversation/Reply.java
@@ -1,6 +1,6 @@
-package com.gpl.rpg.AndorsTrail_beta1.model.conversation;
+package com.gpl.rpg.AndorsTrail.model.conversation;
 
-import com.gpl.rpg.AndorsTrail_beta1.model.script.Requirement;
+import com.gpl.rpg.AndorsTrail.model.script.Requirement;
 
 public final class Reply {
 	public final String text;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/item/DropList.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/DropList.java
similarity index 77%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/item/DropList.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/DropList.java
index 4feb2b24b..cf0de6c4f 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/item/DropList.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/DropList.java
@@ -1,9 +1,9 @@
-package com.gpl.rpg.AndorsTrail_beta1.model.item;
+package com.gpl.rpg.AndorsTrail.model.item;
 
-import com.gpl.rpg.AndorsTrail_beta1.controller.Constants;
-import com.gpl.rpg.AndorsTrail_beta1.controller.SkillController;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Player;
-import com.gpl.rpg.AndorsTrail_beta1.util.ConstRange;
+import com.gpl.rpg.AndorsTrail.controller.Constants;
+import com.gpl.rpg.AndorsTrail.controller.SkillController;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.util.ConstRange;
 
 public final class DropList {
 	private final DropItem[] items;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/item/DropListCollection.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/DropListCollection.java
similarity index 78%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/item/DropListCollection.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/DropListCollection.java
index 8d3170e26..f0e428b09 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/item/DropListCollection.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/DropListCollection.java
@@ -1,10 +1,10 @@
-package com.gpl.rpg.AndorsTrail_beta1.model.item;
+package com.gpl.rpg.AndorsTrail.model.item;
 
 import java.util.HashMap;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta1.resource.parsers.DropListParser;
-import com.gpl.rpg.AndorsTrail_beta1.util.L;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.resource.parsers.DropListParser;
+import com.gpl.rpg.AndorsTrail.util.L;
 
 public final class DropListCollection {
 	public static final String DROPLIST_STARTITEMS = "startitems";
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/item/Inventory.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/Inventory.java
similarity index 96%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/item/Inventory.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/Inventory.java
index 0ea2541e7..25e247a98 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/item/Inventory.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/Inventory.java
@@ -1,11 +1,11 @@
-package com.gpl.rpg.AndorsTrail_beta1.model.item;
+package com.gpl.rpg.AndorsTrail.model.item;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta1.savegames.LegacySavegameFormatReaderForItemContainer;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.savegames.LegacySavegameFormatReaderForItemContainer;
 
 public final class Inventory extends ItemContainer {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/item/ItemCategory.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemCategory.java
similarity index 97%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/item/ItemCategory.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemCategory.java
index f09bfab0d..901973a86 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/item/ItemCategory.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemCategory.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.model.item;
+package com.gpl.rpg.AndorsTrail.model.item;
 
 public final class ItemCategory {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/item/ItemCategoryCollection.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemCategoryCollection.java
similarity index 75%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/item/ItemCategoryCollection.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemCategoryCollection.java
index 963184689..ea52eb460 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/item/ItemCategoryCollection.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemCategoryCollection.java
@@ -1,10 +1,10 @@
-package com.gpl.rpg.AndorsTrail_beta1.model.item;
+package com.gpl.rpg.AndorsTrail.model.item;
 
 import java.util.HashMap;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta1.resource.parsers.ItemCategoryParser;
-import com.gpl.rpg.AndorsTrail_beta1.util.L;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.resource.parsers.ItemCategoryParser;
+import com.gpl.rpg.AndorsTrail.util.L;
 
 public final class ItemCategoryCollection {
 	private final HashMap<String, ItemCategory> itemCategories = new HashMap<String, ItemCategory>();
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/item/ItemContainer.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemContainer.java
similarity index 97%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/item/ItemContainer.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemContainer.java
index 61e7a7435..5e9bf31ef 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/item/ItemContainer.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemContainer.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.model.item;
+package com.gpl.rpg.AndorsTrail.model.item;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
@@ -7,8 +7,8 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 
-import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
 
 public class ItemContainer {
 	public final ArrayList<ItemEntry> items = new ArrayList<ItemEntry>();
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/item/ItemTraits_OnEquip.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemTraits_OnEquip.java
similarity index 69%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/item/ItemTraits_OnEquip.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemTraits_OnEquip.java
index e1a62c00c..0c22f4393 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/item/ItemTraits_OnEquip.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemTraits_OnEquip.java
@@ -1,7 +1,7 @@
-package com.gpl.rpg.AndorsTrail_beta1.model.item;
+package com.gpl.rpg.AndorsTrail.model.item;
 
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.ActorConditionEffect;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.traits.AbilityModifierTraits;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionEffect;
+import com.gpl.rpg.AndorsTrail.model.ability.traits.AbilityModifierTraits;
 
 public final class ItemTraits_OnEquip {
 	public final AbilityModifierTraits stats;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/item/ItemTraits_OnHitReceived.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemTraits_OnHitReceived.java
similarity index 78%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/item/ItemTraits_OnHitReceived.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemTraits_OnHitReceived.java
index c10a7126d..12372ed53 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/item/ItemTraits_OnHitReceived.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemTraits_OnHitReceived.java
@@ -1,7 +1,7 @@
-package com.gpl.rpg.AndorsTrail_beta1.model.item;
+package com.gpl.rpg.AndorsTrail.model.item;
 
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.ActorConditionEffect;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.traits.StatsModifierTraits;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionEffect;
+import com.gpl.rpg.AndorsTrail.model.ability.traits.StatsModifierTraits;
 
 public class ItemTraits_OnHitReceived extends ItemTraits_OnUse {
 	
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/item/ItemTraits_OnUse.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemTraits_OnUse.java
similarity index 82%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/item/ItemTraits_OnUse.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemTraits_OnUse.java
index 6fa512a20..0b0af9699 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/item/ItemTraits_OnUse.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemTraits_OnUse.java
@@ -1,7 +1,7 @@
-package com.gpl.rpg.AndorsTrail_beta1.model.item;
+package com.gpl.rpg.AndorsTrail.model.item;
 
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.ActorConditionEffect;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.traits.StatsModifierTraits;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionEffect;
+import com.gpl.rpg.AndorsTrail.model.ability.traits.StatsModifierTraits;
 
 public class ItemTraits_OnUse {
 	public final StatsModifierTraits changedStats;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/item/ItemType.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemType.java
similarity index 94%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/item/ItemType.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemType.java
index 60d768210..b88e41d3a 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/item/ItemType.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemType.java
@@ -1,8 +1,8 @@
-package com.gpl.rpg.AndorsTrail_beta1.model.item;
+package com.gpl.rpg.AndorsTrail.model.item;
 
-import com.gpl.rpg.AndorsTrail_beta1.controller.Constants;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Player;
-import com.gpl.rpg.AndorsTrail_beta1.resource.tiles.TileManager;
+import com.gpl.rpg.AndorsTrail.controller.Constants;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
 
 public final class ItemType {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/item/ItemTypeCollection.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemTypeCollection.java
similarity index 79%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/item/ItemTypeCollection.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemTypeCollection.java
index 48c0f37f7..9a6d6324f 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/item/ItemTypeCollection.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemTypeCollection.java
@@ -1,10 +1,10 @@
-package com.gpl.rpg.AndorsTrail_beta1.model.item;
+package com.gpl.rpg.AndorsTrail.model.item;
 
 import java.util.HashMap;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta1.resource.parsers.ItemTypeParser;
-import com.gpl.rpg.AndorsTrail_beta1.util.L;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.resource.parsers.ItemTypeParser;
+import com.gpl.rpg.AndorsTrail.util.L;
 
 public final class ItemTypeCollection {
 	private static final String ITEMTYPE_GOLD = "gold";
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/item/Loot.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/Loot.java
similarity index 88%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/item/Loot.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/Loot.java
index 1b2048837..52d6bb0fe 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/item/Loot.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/Loot.java
@@ -1,12 +1,12 @@
-package com.gpl.rpg.AndorsTrail_beta1.model.item;
+package com.gpl.rpg.AndorsTrail.model.item;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta1.savegames.LegacySavegameFormatReaderForItemContainer;
-import com.gpl.rpg.AndorsTrail_beta1.util.Coord;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.savegames.LegacySavegameFormatReaderForItemContainer;
+import com.gpl.rpg.AndorsTrail.util.Coord;
 
 public final class Loot {
 	public int exp = 0;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/map/LayeredTileMap.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/LayeredTileMap.java
similarity index 97%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/map/LayeredTileMap.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/LayeredTileMap.java
index 6cdcf17c4..736565aba 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/map/LayeredTileMap.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/LayeredTileMap.java
@@ -1,10 +1,10 @@
-package com.gpl.rpg.AndorsTrail_beta1.model.map;
+package com.gpl.rpg.AndorsTrail.model.map;
 
 import java.util.Collection;
 
-import com.gpl.rpg.AndorsTrail_beta1.util.Coord;
-import com.gpl.rpg.AndorsTrail_beta1.util.CoordRect;
-import com.gpl.rpg.AndorsTrail_beta1.util.Size;
+import com.gpl.rpg.AndorsTrail.util.Coord;
+import com.gpl.rpg.AndorsTrail.util.CoordRect;
+import com.gpl.rpg.AndorsTrail.util.Size;
 
 import android.graphics.ColorFilter;
 import android.graphics.ColorMatrixColorFilter;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/map/MapCollection.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MapCollection.java
similarity index 88%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/map/MapCollection.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MapCollection.java
index 346bab016..8f598c1cf 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/map/MapCollection.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MapCollection.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.model.map;
+package com.gpl.rpg.AndorsTrail.model.map;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
@@ -8,11 +8,11 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta1.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta1.savegames.LegacySavegameFormatReaderForMap;
-import com.gpl.rpg.AndorsTrail_beta1.util.L;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.savegames.LegacySavegameFormatReaderForMap;
+import com.gpl.rpg.AndorsTrail.util.L;
 
 public final class MapCollection {
 	private final HashMap<String, PredefinedMap> predefinedMaps = new HashMap<String, PredefinedMap>();
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/map/MapLayer.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MapLayer.java
similarity index 68%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/map/MapLayer.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MapLayer.java
index 1aed068b8..b10d64c39 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/map/MapLayer.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MapLayer.java
@@ -1,6 +1,6 @@
-package com.gpl.rpg.AndorsTrail_beta1.model.map;
+package com.gpl.rpg.AndorsTrail.model.map;
 
-import com.gpl.rpg.AndorsTrail_beta1.util.Size;
+import com.gpl.rpg.AndorsTrail.util.Size;
 
 public final class MapLayer {
 	public final int[][] tiles;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/map/MapObject.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MapObject.java
similarity index 92%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/map/MapObject.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MapObject.java
index e3f79bb49..d313461ff 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/map/MapObject.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MapObject.java
@@ -1,8 +1,8 @@
-package com.gpl.rpg.AndorsTrail_beta1.model.map;
+package com.gpl.rpg.AndorsTrail.model.map;
 
-import com.gpl.rpg.AndorsTrail_beta1.model.item.DropList;
-import com.gpl.rpg.AndorsTrail_beta1.model.script.Requirement;
-import com.gpl.rpg.AndorsTrail_beta1.util.CoordRect;
+import com.gpl.rpg.AndorsTrail.model.item.DropList;
+import com.gpl.rpg.AndorsTrail.model.script.Requirement;
+import com.gpl.rpg.AndorsTrail.util.CoordRect;
 
 public final class MapObject {
 	public static enum MapObjectType {
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/map/MapSection.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MapSection.java
similarity index 93%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/map/MapSection.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MapSection.java
index 39290c322..56f7ebf80 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/map/MapSection.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MapSection.java
@@ -1,7 +1,7 @@
-package com.gpl.rpg.AndorsTrail_beta1.model.map;
+package com.gpl.rpg.AndorsTrail.model.map;
 
-import com.gpl.rpg.AndorsTrail_beta1.util.ByteUtils;
-import com.gpl.rpg.AndorsTrail_beta1.util.CoordRect;
+import com.gpl.rpg.AndorsTrail.util.ByteUtils;
+import com.gpl.rpg.AndorsTrail.util.CoordRect;
 
 public final class MapSection {
 	public final MapLayer layerBase;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/map/MonsterSpawnArea.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MonsterSpawnArea.java
similarity index 89%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/map/MonsterSpawnArea.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MonsterSpawnArea.java
index 3f550cb96..730afd5ac 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/map/MonsterSpawnArea.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MonsterSpawnArea.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.model.map;
+package com.gpl.rpg.AndorsTrail.model.map;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
@@ -6,13 +6,13 @@ import java.io.IOException;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta1.controller.Constants;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Monster;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.MonsterType;
-import com.gpl.rpg.AndorsTrail_beta1.util.Coord;
-import com.gpl.rpg.AndorsTrail_beta1.util.CoordRect;
-import com.gpl.rpg.AndorsTrail_beta1.util.Range;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.controller.Constants;
+import com.gpl.rpg.AndorsTrail.model.actor.Monster;
+import com.gpl.rpg.AndorsTrail.model.actor.MonsterType;
+import com.gpl.rpg.AndorsTrail.util.Coord;
+import com.gpl.rpg.AndorsTrail.util.CoordRect;
+import com.gpl.rpg.AndorsTrail.util.Range;
 
 public final class MonsterSpawnArea {
 	public final CoordRect area;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/map/PredefinedMap.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/PredefinedMap.java
similarity index 93%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/map/PredefinedMap.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/PredefinedMap.java
index 393dac691..66f352924 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/map/PredefinedMap.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/PredefinedMap.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.model.map;
+package com.gpl.rpg.AndorsTrail.model.map;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
@@ -7,19 +7,19 @@ import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta1.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta1.controller.Constants;
-import com.gpl.rpg.AndorsTrail_beta1.controller.VisualEffectController.BloodSplatter;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Monster;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemType;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.Loot;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.MapObject.MapObjectType;
-import com.gpl.rpg.AndorsTrail_beta1.util.Coord;
-import com.gpl.rpg.AndorsTrail_beta1.util.CoordRect;
-import com.gpl.rpg.AndorsTrail_beta1.util.L;
-import com.gpl.rpg.AndorsTrail_beta1.util.Size;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.controller.Constants;
+import com.gpl.rpg.AndorsTrail.controller.VisualEffectController.BloodSplatter;
+import com.gpl.rpg.AndorsTrail.model.actor.Monster;
+import com.gpl.rpg.AndorsTrail.model.item.ItemType;
+import com.gpl.rpg.AndorsTrail.model.item.Loot;
+import com.gpl.rpg.AndorsTrail.model.map.MapObject.MapObjectType;
+import com.gpl.rpg.AndorsTrail.util.Coord;
+import com.gpl.rpg.AndorsTrail.util.CoordRect;
+import com.gpl.rpg.AndorsTrail.util.L;
+import com.gpl.rpg.AndorsTrail.util.Size;
 
 public final class PredefinedMap {
 	private static final long VISIT_RESET = 0;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/map/ReplaceableMapSection.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/ReplaceableMapSection.java
similarity index 80%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/map/ReplaceableMapSection.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/ReplaceableMapSection.java
index 16c31ad9f..b87b68004 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/map/ReplaceableMapSection.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/ReplaceableMapSection.java
@@ -1,7 +1,7 @@
-package com.gpl.rpg.AndorsTrail_beta1.model.map;
+package com.gpl.rpg.AndorsTrail.model.map;
 
-import com.gpl.rpg.AndorsTrail_beta1.model.script.Requirement;
-import com.gpl.rpg.AndorsTrail_beta1.util.CoordRect;
+import com.gpl.rpg.AndorsTrail.model.script.Requirement;
+import com.gpl.rpg.AndorsTrail.util.CoordRect;
 
 public final class ReplaceableMapSection {
 	public boolean isApplied = false;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/map/TMXMapFileParser.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/TMXMapFileParser.java
similarity index 97%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/map/TMXMapFileParser.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/TMXMapFileParser.java
index 11192f0b6..a94c61f0d 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/map/TMXMapFileParser.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/TMXMapFileParser.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.model.map;
+package com.gpl.rpg.AndorsTrail.model.map;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -13,10 +13,10 @@ import org.xmlpull.v1.XmlPullParserException;
 import android.content.res.Resources;
 import android.content.res.XmlResourceParser;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta1.util.Base64;
-import com.gpl.rpg.AndorsTrail_beta1.util.L;
-import com.gpl.rpg.AndorsTrail_beta1.util.XmlResourceParserUtils;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.util.Base64;
+import com.gpl.rpg.AndorsTrail.util.L;
+import com.gpl.rpg.AndorsTrail.util.XmlResourceParserUtils;
 
 public final class TMXMapFileParser {
 	private static final int TILESIZE = 32;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/map/TMXMapTranslator.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/TMXMapTranslator.java
similarity index 93%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/map/TMXMapTranslator.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/TMXMapTranslator.java
index 8e497c01b..daf916449 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/map/TMXMapTranslator.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/TMXMapTranslator.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.model.map;
+package com.gpl.rpg.AndorsTrail.model.map;
 
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
@@ -12,29 +12,29 @@ import java.util.List;
 
 import android.content.res.Resources;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.MonsterType;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.MonsterTypeCollection;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.DropList;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.DropListCollection;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.TMXMapFileParser.TMXLayer;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.TMXMapFileParser.TMXLayerMap;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.TMXMapFileParser.TMXMap;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.TMXMapFileParser.TMXObject;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.TMXMapFileParser.TMXObjectGroup;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.TMXMapFileParser.TMXObjectMap;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.TMXMapFileParser.TMXProperty;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.TMXMapFileParser.TMXTileSet;
-import com.gpl.rpg.AndorsTrail_beta1.model.quest.QuestProgress;
-import com.gpl.rpg.AndorsTrail_beta1.model.script.Requirement;
-import com.gpl.rpg.AndorsTrail_beta1.resource.parsers.ResourceParserUtils;
-import com.gpl.rpg.AndorsTrail_beta1.resource.tiles.TileCache;
-import com.gpl.rpg.AndorsTrail_beta1.util.ConstRange;
-import com.gpl.rpg.AndorsTrail_beta1.util.Coord;
-import com.gpl.rpg.AndorsTrail_beta1.util.CoordRect;
-import com.gpl.rpg.AndorsTrail_beta1.util.L;
-import com.gpl.rpg.AndorsTrail_beta1.util.Range;
-import com.gpl.rpg.AndorsTrail_beta1.util.Size;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.model.actor.MonsterType;
+import com.gpl.rpg.AndorsTrail.model.actor.MonsterTypeCollection;
+import com.gpl.rpg.AndorsTrail.model.item.DropList;
+import com.gpl.rpg.AndorsTrail.model.item.DropListCollection;
+import com.gpl.rpg.AndorsTrail.model.map.TMXMapFileParser.TMXLayer;
+import com.gpl.rpg.AndorsTrail.model.map.TMXMapFileParser.TMXLayerMap;
+import com.gpl.rpg.AndorsTrail.model.map.TMXMapFileParser.TMXMap;
+import com.gpl.rpg.AndorsTrail.model.map.TMXMapFileParser.TMXObject;
+import com.gpl.rpg.AndorsTrail.model.map.TMXMapFileParser.TMXObjectGroup;
+import com.gpl.rpg.AndorsTrail.model.map.TMXMapFileParser.TMXObjectMap;
+import com.gpl.rpg.AndorsTrail.model.map.TMXMapFileParser.TMXProperty;
+import com.gpl.rpg.AndorsTrail.model.map.TMXMapFileParser.TMXTileSet;
+import com.gpl.rpg.AndorsTrail.model.quest.QuestProgress;
+import com.gpl.rpg.AndorsTrail.model.script.Requirement;
+import com.gpl.rpg.AndorsTrail.resource.parsers.ResourceParserUtils;
+import com.gpl.rpg.AndorsTrail.resource.tiles.TileCache;
+import com.gpl.rpg.AndorsTrail.util.ConstRange;
+import com.gpl.rpg.AndorsTrail.util.Coord;
+import com.gpl.rpg.AndorsTrail.util.CoordRect;
+import com.gpl.rpg.AndorsTrail.util.L;
+import com.gpl.rpg.AndorsTrail.util.Range;
+import com.gpl.rpg.AndorsTrail.util.Size;
 
 public final class TMXMapTranslator {
 	private final ArrayList<TMXObjectMap> maps = new ArrayList<TMXObjectMap>();
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/map/WorldMapSegment.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/WorldMapSegment.java
similarity index 92%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/map/WorldMapSegment.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/WorldMapSegment.java
index c5c403ad2..7be483428 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/map/WorldMapSegment.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/WorldMapSegment.java
@@ -1,9 +1,9 @@
-package com.gpl.rpg.AndorsTrail_beta1.model.map;
+package com.gpl.rpg.AndorsTrail.model.map;
 
 import java.util.HashMap;
 import java.util.HashSet;
 
-import com.gpl.rpg.AndorsTrail_beta1.util.Coord;
+import com.gpl.rpg.AndorsTrail.util.Coord;
 
 public final class WorldMapSegment {
 	public final String name;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/quest/Quest.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/Quest.java
similarity index 84%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/quest/Quest.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/Quest.java
index 940cdc81c..5c651deec 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/quest/Quest.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/Quest.java
@@ -1,8 +1,8 @@
-package com.gpl.rpg.AndorsTrail_beta1.model.quest;
+package com.gpl.rpg.AndorsTrail.model.quest;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Player;
-import com.gpl.rpg.AndorsTrail_beta1.util.L;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.util.L;
 
 public final class Quest implements Comparable<Quest> {
 	public final String questID;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/quest/QuestCollection.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/QuestCollection.java
similarity index 80%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/quest/QuestCollection.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/QuestCollection.java
index 1cb9d1b20..9240eaa49 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/quest/QuestCollection.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/QuestCollection.java
@@ -1,13 +1,13 @@
-package com.gpl.rpg.AndorsTrail_beta1.model.quest;
+package com.gpl.rpg.AndorsTrail.model.quest;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta1.resource.parsers.QuestParser;
-import com.gpl.rpg.AndorsTrail_beta1.util.L;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.resource.parsers.QuestParser;
+import com.gpl.rpg.AndorsTrail.util.L;
 
 public final class QuestCollection {
 	private final HashMap<String, Quest> quests = new HashMap<String, Quest>();
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/quest/QuestLogEntry.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/QuestLogEntry.java
similarity index 89%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/quest/QuestLogEntry.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/QuestLogEntry.java
index bf1ea81c7..35eba291e 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/quest/QuestLogEntry.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/QuestLogEntry.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.model.quest;
+package com.gpl.rpg.AndorsTrail.model.quest;
 
 public final class QuestLogEntry {
 	public final int progress;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/quest/QuestProgress.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/QuestProgress.java
similarity index 78%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/quest/QuestProgress.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/QuestProgress.java
index 6c4e72c26..ae48db965 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/quest/QuestProgress.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/QuestProgress.java
@@ -1,8 +1,8 @@
-package com.gpl.rpg.AndorsTrail_beta1.model.quest;
+package com.gpl.rpg.AndorsTrail.model.quest;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta1.resource.parsers.ResourceParserUtils;
-import com.gpl.rpg.AndorsTrail_beta1.util.L;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.resource.parsers.ResourceParserUtils;
+import com.gpl.rpg.AndorsTrail.util.L;
 
 public final class QuestProgress {
 	public final String questID;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/script/Requirement.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/script/Requirement.java
similarity index 93%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/script/Requirement.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/script/Requirement.java
index f1f90f98e..9357b1dd5 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/script/Requirement.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/script/Requirement.java
@@ -1,7 +1,7 @@
-package com.gpl.rpg.AndorsTrail_beta1.model.script;
+package com.gpl.rpg.AndorsTrail.model.script;
 
-import com.gpl.rpg.AndorsTrail_beta1.model.quest.QuestProgress;
-import com.gpl.rpg.AndorsTrail_beta1.util.ConstRange;
+import com.gpl.rpg.AndorsTrail.model.quest.QuestProgress;
+import com.gpl.rpg.AndorsTrail.util.ConstRange;
 
 public final class Requirement {
 	public static enum RequirementType {
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/script/ScriptEffect.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/script/ScriptEffect.java
similarity index 93%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/script/ScriptEffect.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/script/ScriptEffect.java
index a6dd4ba35..1284531ca 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/script/ScriptEffect.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/script/ScriptEffect.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.model.script;
+package com.gpl.rpg.AndorsTrail.model.script;
 
 public final class ScriptEffect {
 	public static enum ScriptEffectType {
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/ConversationLoader.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ConversationLoader.java
similarity index 78%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/ConversationLoader.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ConversationLoader.java
index 791bf2dd3..d0d9c3f87 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/ConversationLoader.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ConversationLoader.java
@@ -1,13 +1,13 @@
-package com.gpl.rpg.AndorsTrail_beta1.resource;
+package com.gpl.rpg.AndorsTrail.resource;
 
 import java.util.Collection;
 import java.util.HashMap;
 
 import android.content.res.Resources;
 
-import com.gpl.rpg.AndorsTrail_beta1.model.conversation.ConversationCollection;
-import com.gpl.rpg.AndorsTrail_beta1.model.conversation.Phrase;
-import com.gpl.rpg.AndorsTrail_beta1.resource.parsers.ConversationListParser;
+import com.gpl.rpg.AndorsTrail.model.conversation.ConversationCollection;
+import com.gpl.rpg.AndorsTrail.model.conversation.Phrase;
+import com.gpl.rpg.AndorsTrail.resource.parsers.ConversationListParser;
 
 public final class ConversationLoader {
 	private final HashMap<String, Integer> resourceIDsPerPhraseID = new HashMap<String, Integer>();
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/DynamicTileLoader.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/DynamicTileLoader.java
similarity index 92%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/DynamicTileLoader.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/DynamicTileLoader.java
index 198592022..32deefbab 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/DynamicTileLoader.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/DynamicTileLoader.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.resource;
+package com.gpl.rpg.AndorsTrail.resource;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -6,11 +6,11 @@ import java.util.Map;
 import android.util.SparseArray;
 import android.util.SparseIntArray;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta1.resource.tiles.ResourceFileTileset;
-import com.gpl.rpg.AndorsTrail_beta1.resource.tiles.TileCache;
-import com.gpl.rpg.AndorsTrail_beta1.util.L;
-import com.gpl.rpg.AndorsTrail_beta1.util.Size;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.resource.tiles.ResourceFileTileset;
+import com.gpl.rpg.AndorsTrail.resource.tiles.TileCache;
+import com.gpl.rpg.AndorsTrail.util.L;
+import com.gpl.rpg.AndorsTrail.util.Size;
 
 public final class DynamicTileLoader {
 	private final TileCache tileCache;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/ResourceLoader.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java
similarity index 96%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/ResourceLoader.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java
index d438522df..ab150cf6d 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/ResourceLoader.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.resource;
+package com.gpl.rpg.AndorsTrail.resource;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -9,21 +9,21 @@ import java.util.Collection;
 import android.content.res.Resources;
 import android.content.res.TypedArray;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta1.R;
-import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta1.model.conversation.ConversationCollection;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.TMXMapTranslator;
-import com.gpl.rpg.AndorsTrail_beta1.resource.parsers.ActorConditionsTypeParser;
-import com.gpl.rpg.AndorsTrail_beta1.resource.parsers.ConversationListParser;
-import com.gpl.rpg.AndorsTrail_beta1.resource.parsers.DropListParser;
-import com.gpl.rpg.AndorsTrail_beta1.resource.parsers.ItemCategoryParser;
-import com.gpl.rpg.AndorsTrail_beta1.resource.parsers.ItemTypeParser;
-import com.gpl.rpg.AndorsTrail_beta1.resource.parsers.MonsterTypeParser;
-import com.gpl.rpg.AndorsTrail_beta1.resource.parsers.QuestParser;
-import com.gpl.rpg.AndorsTrail_beta1.resource.parsers.WorldMapParser;
-import com.gpl.rpg.AndorsTrail_beta1.util.L;
-import com.gpl.rpg.AndorsTrail_beta1.util.Size;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.model.conversation.ConversationCollection;
+import com.gpl.rpg.AndorsTrail.model.map.TMXMapTranslator;
+import com.gpl.rpg.AndorsTrail.resource.parsers.ActorConditionsTypeParser;
+import com.gpl.rpg.AndorsTrail.resource.parsers.ConversationListParser;
+import com.gpl.rpg.AndorsTrail.resource.parsers.DropListParser;
+import com.gpl.rpg.AndorsTrail.resource.parsers.ItemCategoryParser;
+import com.gpl.rpg.AndorsTrail.resource.parsers.ItemTypeParser;
+import com.gpl.rpg.AndorsTrail.resource.parsers.MonsterTypeParser;
+import com.gpl.rpg.AndorsTrail.resource.parsers.QuestParser;
+import com.gpl.rpg.AndorsTrail.resource.parsers.WorldMapParser;
+import com.gpl.rpg.AndorsTrail.util.L;
+import com.gpl.rpg.AndorsTrail.util.Size;
 
 public final class ResourceLoader {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/TranslationLoader.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/TranslationLoader.java
similarity index 97%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/TranslationLoader.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/TranslationLoader.java
index 81c3eeab5..27f752b02 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/TranslationLoader.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/TranslationLoader.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.resource;
+package com.gpl.rpg.AndorsTrail.resource;
 
 import java.io.BufferedInputStream;
 import java.io.File;
@@ -8,8 +8,8 @@ import java.io.InputStream;
 import android.content.res.AssetManager;
 import android.content.res.Resources;
 
-import com.gpl.rpg.AndorsTrail_beta1.R;
-import com.gpl.rpg.AndorsTrail_beta1.util.L;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.util.L;
 
 public final class TranslationLoader {
 	private final BinaryMoFileParser parser;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/VisualEffectCollection.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/VisualEffectCollection.java
similarity index 94%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/VisualEffectCollection.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/VisualEffectCollection.java
index 15a100b47..67f25b0a4 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/VisualEffectCollection.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/VisualEffectCollection.java
@@ -1,9 +1,9 @@
-package com.gpl.rpg.AndorsTrail_beta1.resource;
+package com.gpl.rpg.AndorsTrail.resource;
 
 import android.graphics.Color;
 
-import com.gpl.rpg.AndorsTrail_beta1.R;
-import com.gpl.rpg.AndorsTrail_beta1.util.ConstRange;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.util.ConstRange;
 
 public final class VisualEffectCollection {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/parsers/ActorConditionsTypeParser.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ActorConditionsTypeParser.java
similarity index 77%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/parsers/ActorConditionsTypeParser.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ActorConditionsTypeParser.java
index 069c87989..0efa4e057 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/parsers/ActorConditionsTypeParser.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ActorConditionsTypeParser.java
@@ -1,14 +1,14 @@
-package com.gpl.rpg.AndorsTrail_beta1.resource.parsers;
+package com.gpl.rpg.AndorsTrail.resource.parsers;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.ActorConditionType;
-import com.gpl.rpg.AndorsTrail_beta1.resource.DynamicTileLoader;
-import com.gpl.rpg.AndorsTrail_beta1.resource.TranslationLoader;
-import com.gpl.rpg.AndorsTrail_beta1.resource.parsers.json.JsonCollectionParserFor;
-import com.gpl.rpg.AndorsTrail_beta1.resource.parsers.json.JsonFieldNames;
-import com.gpl.rpg.AndorsTrail_beta1.util.Pair;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionType;
+import com.gpl.rpg.AndorsTrail.resource.DynamicTileLoader;
+import com.gpl.rpg.AndorsTrail.resource.TranslationLoader;
+import com.gpl.rpg.AndorsTrail.resource.parsers.json.JsonCollectionParserFor;
+import com.gpl.rpg.AndorsTrail.resource.parsers.json.JsonFieldNames;
+import com.gpl.rpg.AndorsTrail.util.Pair;
 
 public final class ActorConditionsTypeParser extends JsonCollectionParserFor<ActorConditionType> {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/parsers/ConversationListParser.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ConversationListParser.java
similarity index 78%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/parsers/ConversationListParser.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ConversationListParser.java
index ffb07b35d..215c984b2 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/parsers/ConversationListParser.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ConversationListParser.java
@@ -1,19 +1,19 @@
-package com.gpl.rpg.AndorsTrail_beta1.resource.parsers;
+package com.gpl.rpg.AndorsTrail.resource.parsers;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta1.model.conversation.Phrase;
-import com.gpl.rpg.AndorsTrail_beta1.model.conversation.Reply;
-import com.gpl.rpg.AndorsTrail_beta1.model.script.Requirement;
-import com.gpl.rpg.AndorsTrail_beta1.model.script.ScriptEffect;
-import com.gpl.rpg.AndorsTrail_beta1.resource.TranslationLoader;
-import com.gpl.rpg.AndorsTrail_beta1.resource.parsers.json.JsonArrayParserFor;
-import com.gpl.rpg.AndorsTrail_beta1.resource.parsers.json.JsonCollectionParserFor;
-import com.gpl.rpg.AndorsTrail_beta1.resource.parsers.json.JsonFieldNames;
-import com.gpl.rpg.AndorsTrail_beta1.util.L;
-import com.gpl.rpg.AndorsTrail_beta1.util.Pair;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.model.conversation.Phrase;
+import com.gpl.rpg.AndorsTrail.model.conversation.Reply;
+import com.gpl.rpg.AndorsTrail.model.script.Requirement;
+import com.gpl.rpg.AndorsTrail.model.script.ScriptEffect;
+import com.gpl.rpg.AndorsTrail.resource.TranslationLoader;
+import com.gpl.rpg.AndorsTrail.resource.parsers.json.JsonArrayParserFor;
+import com.gpl.rpg.AndorsTrail.resource.parsers.json.JsonCollectionParserFor;
+import com.gpl.rpg.AndorsTrail.resource.parsers.json.JsonFieldNames;
+import com.gpl.rpg.AndorsTrail.util.L;
+import com.gpl.rpg.AndorsTrail.util.Pair;
 
 public final class ConversationListParser extends JsonCollectionParserFor<Phrase> {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/parsers/DropListParser.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/DropListParser.java
similarity index 65%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/parsers/DropListParser.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/DropListParser.java
index e90b623a7..e9e1abaef 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/parsers/DropListParser.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/DropListParser.java
@@ -1,17 +1,17 @@
-package com.gpl.rpg.AndorsTrail_beta1.resource.parsers;
+package com.gpl.rpg.AndorsTrail.resource.parsers;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.DropList;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.DropList.DropItem;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemTypeCollection;
-import com.gpl.rpg.AndorsTrail_beta1.resource.parsers.json.JsonArrayParserFor;
-import com.gpl.rpg.AndorsTrail_beta1.resource.parsers.json.JsonCollectionParserFor;
-import com.gpl.rpg.AndorsTrail_beta1.resource.parsers.json.JsonFieldNames;
-import com.gpl.rpg.AndorsTrail_beta1.util.L;
-import com.gpl.rpg.AndorsTrail_beta1.util.Pair;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.model.item.DropList;
+import com.gpl.rpg.AndorsTrail.model.item.DropList.DropItem;
+import com.gpl.rpg.AndorsTrail.model.item.ItemTypeCollection;
+import com.gpl.rpg.AndorsTrail.resource.parsers.json.JsonArrayParserFor;
+import com.gpl.rpg.AndorsTrail.resource.parsers.json.JsonCollectionParserFor;
+import com.gpl.rpg.AndorsTrail.resource.parsers.json.JsonFieldNames;
+import com.gpl.rpg.AndorsTrail.util.L;
+import com.gpl.rpg.AndorsTrail.util.Pair;
 
 public final class DropListParser extends JsonCollectionParserFor<DropList> {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/parsers/ItemCategoryParser.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ItemCategoryParser.java
similarity index 70%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/parsers/ItemCategoryParser.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ItemCategoryParser.java
index 9283119c0..dcb4cb59f 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/parsers/ItemCategoryParser.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ItemCategoryParser.java
@@ -1,14 +1,14 @@
-package com.gpl.rpg.AndorsTrail_beta1.resource.parsers;
+package com.gpl.rpg.AndorsTrail.resource.parsers;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import com.gpl.rpg.AndorsTrail_beta1.model.item.Inventory;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemCategory;
-import com.gpl.rpg.AndorsTrail_beta1.resource.TranslationLoader;
-import com.gpl.rpg.AndorsTrail_beta1.resource.parsers.json.JsonCollectionParserFor;
-import com.gpl.rpg.AndorsTrail_beta1.resource.parsers.json.JsonFieldNames;
-import com.gpl.rpg.AndorsTrail_beta1.util.Pair;
+import com.gpl.rpg.AndorsTrail.model.item.Inventory;
+import com.gpl.rpg.AndorsTrail.model.item.ItemCategory;
+import com.gpl.rpg.AndorsTrail.resource.TranslationLoader;
+import com.gpl.rpg.AndorsTrail.resource.parsers.json.JsonCollectionParserFor;
+import com.gpl.rpg.AndorsTrail.resource.parsers.json.JsonFieldNames;
+import com.gpl.rpg.AndorsTrail.util.Pair;
 
 public final class ItemCategoryParser extends JsonCollectionParserFor<ItemCategory> {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/parsers/ItemTraitsParser.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ItemTraitsParser.java
similarity index 84%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/parsers/ItemTraitsParser.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ItemTraitsParser.java
index 064497e94..7b67f247a 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/parsers/ItemTraitsParser.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ItemTraitsParser.java
@@ -1,21 +1,21 @@
-package com.gpl.rpg.AndorsTrail_beta1.resource.parsers;
+package com.gpl.rpg.AndorsTrail.resource.parsers;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.ActorCondition;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.ActorConditionEffect;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.ActorConditionTypeCollection;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.traits.AbilityModifierTraits;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.traits.StatsModifierTraits;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemTraits_OnEquip;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemTraits_OnHitReceived;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemTraits_OnUse;
-import com.gpl.rpg.AndorsTrail_beta1.resource.parsers.json.JsonArrayParserFor;
-import com.gpl.rpg.AndorsTrail_beta1.resource.parsers.json.JsonFieldNames;
-import com.gpl.rpg.AndorsTrail_beta1.util.ConstRange;
-import com.gpl.rpg.AndorsTrail_beta1.util.L;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorCondition;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionEffect;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionTypeCollection;
+import com.gpl.rpg.AndorsTrail.model.ability.traits.AbilityModifierTraits;
+import com.gpl.rpg.AndorsTrail.model.ability.traits.StatsModifierTraits;
+import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnEquip;
+import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnHitReceived;
+import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnUse;
+import com.gpl.rpg.AndorsTrail.resource.parsers.json.JsonArrayParserFor;
+import com.gpl.rpg.AndorsTrail.resource.parsers.json.JsonFieldNames;
+import com.gpl.rpg.AndorsTrail.util.ConstRange;
+import com.gpl.rpg.AndorsTrail.util.L;
 
 public final class ItemTraitsParser {
 	private final JsonArrayParserFor<ActorConditionEffect> actorConditionEffectParser_withDuration;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/parsers/ItemTypeParser.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ItemTypeParser.java
similarity index 76%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/parsers/ItemTypeParser.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ItemTypeParser.java
index d2c576bd7..104398a50 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/parsers/ItemTypeParser.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ItemTypeParser.java
@@ -1,19 +1,19 @@
-package com.gpl.rpg.AndorsTrail_beta1.resource.parsers;
+package com.gpl.rpg.AndorsTrail.resource.parsers;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.ActorConditionTypeCollection;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemCategoryCollection;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemTraits_OnEquip;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemTraits_OnHitReceived;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemTraits_OnUse;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemType;
-import com.gpl.rpg.AndorsTrail_beta1.resource.DynamicTileLoader;
-import com.gpl.rpg.AndorsTrail_beta1.resource.TranslationLoader;
-import com.gpl.rpg.AndorsTrail_beta1.resource.parsers.json.JsonCollectionParserFor;
-import com.gpl.rpg.AndorsTrail_beta1.resource.parsers.json.JsonFieldNames;
-import com.gpl.rpg.AndorsTrail_beta1.util.Pair;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionTypeCollection;
+import com.gpl.rpg.AndorsTrail.model.item.ItemCategoryCollection;
+import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnEquip;
+import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnHitReceived;
+import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnUse;
+import com.gpl.rpg.AndorsTrail.model.item.ItemType;
+import com.gpl.rpg.AndorsTrail.resource.DynamicTileLoader;
+import com.gpl.rpg.AndorsTrail.resource.TranslationLoader;
+import com.gpl.rpg.AndorsTrail.resource.parsers.json.JsonCollectionParserFor;
+import com.gpl.rpg.AndorsTrail.resource.parsers.json.JsonFieldNames;
+import com.gpl.rpg.AndorsTrail.util.Pair;
 
 public final class ItemTypeParser extends JsonCollectionParserFor<ItemType> {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/parsers/MonsterTypeParser.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/MonsterTypeParser.java
similarity index 84%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/parsers/MonsterTypeParser.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/MonsterTypeParser.java
index 87974cbff..4f6f47b64 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/parsers/MonsterTypeParser.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/MonsterTypeParser.java
@@ -1,21 +1,21 @@
-package com.gpl.rpg.AndorsTrail_beta1.resource.parsers;
+package com.gpl.rpg.AndorsTrail.resource.parsers;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import com.gpl.rpg.AndorsTrail_beta1.controller.Constants;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.ActorConditionTypeCollection;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.MonsterType;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.DropListCollection;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemTraits_OnHitReceived;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemTraits_OnUse;
-import com.gpl.rpg.AndorsTrail_beta1.resource.DynamicTileLoader;
-import com.gpl.rpg.AndorsTrail_beta1.resource.TranslationLoader;
-import com.gpl.rpg.AndorsTrail_beta1.resource.parsers.json.JsonCollectionParserFor;
-import com.gpl.rpg.AndorsTrail_beta1.resource.parsers.json.JsonFieldNames;
-import com.gpl.rpg.AndorsTrail_beta1.util.ConstRange;
-import com.gpl.rpg.AndorsTrail_beta1.util.Pair;
-import com.gpl.rpg.AndorsTrail_beta1.util.Size;
+import com.gpl.rpg.AndorsTrail.controller.Constants;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionTypeCollection;
+import com.gpl.rpg.AndorsTrail.model.actor.MonsterType;
+import com.gpl.rpg.AndorsTrail.model.item.DropListCollection;
+import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnHitReceived;
+import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnUse;
+import com.gpl.rpg.AndorsTrail.resource.DynamicTileLoader;
+import com.gpl.rpg.AndorsTrail.resource.TranslationLoader;
+import com.gpl.rpg.AndorsTrail.resource.parsers.json.JsonCollectionParserFor;
+import com.gpl.rpg.AndorsTrail.resource.parsers.json.JsonFieldNames;
+import com.gpl.rpg.AndorsTrail.util.ConstRange;
+import com.gpl.rpg.AndorsTrail.util.Pair;
+import com.gpl.rpg.AndorsTrail.util.Size;
 
 public final class MonsterTypeParser extends JsonCollectionParserFor<MonsterType> {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/parsers/QuestParser.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/QuestParser.java
similarity index 76%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/parsers/QuestParser.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/QuestParser.java
index ce360a4d6..0693e63d8 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/parsers/QuestParser.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/QuestParser.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.resource.parsers;
+package com.gpl.rpg.AndorsTrail.resource.parsers;
 
 import java.util.Arrays;
 import java.util.Comparator;
@@ -6,13 +6,13 @@ import java.util.Comparator;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import com.gpl.rpg.AndorsTrail_beta1.model.quest.Quest;
-import com.gpl.rpg.AndorsTrail_beta1.model.quest.QuestLogEntry;
-import com.gpl.rpg.AndorsTrail_beta1.resource.TranslationLoader;
-import com.gpl.rpg.AndorsTrail_beta1.resource.parsers.json.JsonArrayParserFor;
-import com.gpl.rpg.AndorsTrail_beta1.resource.parsers.json.JsonCollectionParserFor;
-import com.gpl.rpg.AndorsTrail_beta1.resource.parsers.json.JsonFieldNames;
-import com.gpl.rpg.AndorsTrail_beta1.util.Pair;
+import com.gpl.rpg.AndorsTrail.model.quest.Quest;
+import com.gpl.rpg.AndorsTrail.model.quest.QuestLogEntry;
+import com.gpl.rpg.AndorsTrail.resource.TranslationLoader;
+import com.gpl.rpg.AndorsTrail.resource.parsers.json.JsonArrayParserFor;
+import com.gpl.rpg.AndorsTrail.resource.parsers.json.JsonCollectionParserFor;
+import com.gpl.rpg.AndorsTrail.resource.parsers.json.JsonFieldNames;
+import com.gpl.rpg.AndorsTrail.util.Pair;
 
 public final class QuestParser extends JsonCollectionParserFor<Quest> {
 	private final TranslationLoader translationLoader;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/parsers/ResourceParserUtils.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ResourceParserUtils.java
similarity index 90%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/parsers/ResourceParserUtils.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ResourceParserUtils.java
index d038b34fc..3619b43ff 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/parsers/ResourceParserUtils.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ResourceParserUtils.java
@@ -1,17 +1,17 @@
-package com.gpl.rpg.AndorsTrail_beta1.resource.parsers;
+package com.gpl.rpg.AndorsTrail.resource.parsers;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.traits.AbilityModifierTraits;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.traits.StatsModifierTraits;
-import com.gpl.rpg.AndorsTrail_beta1.resource.DynamicTileLoader;
-import com.gpl.rpg.AndorsTrail_beta1.resource.VisualEffectCollection;
-import com.gpl.rpg.AndorsTrail_beta1.resource.parsers.json.JsonFieldNames;
-import com.gpl.rpg.AndorsTrail_beta1.util.ConstRange;
-import com.gpl.rpg.AndorsTrail_beta1.util.L;
-import com.gpl.rpg.AndorsTrail_beta1.util.Size;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.model.ability.traits.AbilityModifierTraits;
+import com.gpl.rpg.AndorsTrail.model.ability.traits.StatsModifierTraits;
+import com.gpl.rpg.AndorsTrail.resource.DynamicTileLoader;
+import com.gpl.rpg.AndorsTrail.resource.VisualEffectCollection;
+import com.gpl.rpg.AndorsTrail.resource.parsers.json.JsonFieldNames;
+import com.gpl.rpg.AndorsTrail.util.ConstRange;
+import com.gpl.rpg.AndorsTrail.util.L;
+import com.gpl.rpg.AndorsTrail.util.Size;
 
 public final class ResourceParserUtils {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/parsers/WorldMapParser.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/WorldMapParser.java
similarity index 81%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/parsers/WorldMapParser.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/WorldMapParser.java
index 50363db78..5a050e829 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/parsers/WorldMapParser.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/WorldMapParser.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.resource.parsers;
+package com.gpl.rpg.AndorsTrail.resource.parsers;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -8,15 +8,15 @@ import org.xmlpull.v1.XmlPullParserException;
 import android.content.res.Resources;
 import android.content.res.XmlResourceParser;
 
-import com.gpl.rpg.AndorsTrail_beta1.model.map.MapCollection;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.WorldMapSegment;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.WorldMapSegment.NamedWorldMapArea;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.WorldMapSegment.WorldMapSegmentMap;
-import com.gpl.rpg.AndorsTrail_beta1.resource.TranslationLoader;
-import com.gpl.rpg.AndorsTrail_beta1.util.Coord;
-import com.gpl.rpg.AndorsTrail_beta1.util.L;
-import com.gpl.rpg.AndorsTrail_beta1.util.Pair;
-import com.gpl.rpg.AndorsTrail_beta1.util.XmlResourceParserUtils;
+import com.gpl.rpg.AndorsTrail.model.map.MapCollection;
+import com.gpl.rpg.AndorsTrail.model.map.WorldMapSegment;
+import com.gpl.rpg.AndorsTrail.model.map.WorldMapSegment.NamedWorldMapArea;
+import com.gpl.rpg.AndorsTrail.model.map.WorldMapSegment.WorldMapSegmentMap;
+import com.gpl.rpg.AndorsTrail.resource.TranslationLoader;
+import com.gpl.rpg.AndorsTrail.util.Coord;
+import com.gpl.rpg.AndorsTrail.util.L;
+import com.gpl.rpg.AndorsTrail.util.Pair;
+import com.gpl.rpg.AndorsTrail.util.XmlResourceParserUtils;
 
 public final class WorldMapParser {
 	public static void read(Resources r, int xmlResourceId, final MapCollection maps, TranslationLoader translationLoader) {
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/parsers/json/JsonArrayParserFor.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/json/JsonArrayParserFor.java
similarity index 93%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/parsers/json/JsonArrayParserFor.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/json/JsonArrayParserFor.java
index 88ebc50ff..c31615db3 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/parsers/json/JsonArrayParserFor.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/json/JsonArrayParserFor.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.resource.parsers.json;
+package com.gpl.rpg.AndorsTrail.resource.parsers.json;
 
 import java.lang.reflect.Array;
 import java.util.ArrayList;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/parsers/json/JsonCollectionParserFor.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/json/JsonCollectionParserFor.java
similarity index 85%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/parsers/json/JsonCollectionParserFor.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/json/JsonCollectionParserFor.java
index 62a03a9a3..59aeec324 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/parsers/json/JsonCollectionParserFor.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/json/JsonCollectionParserFor.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.resource.parsers.json;
+package com.gpl.rpg.AndorsTrail.resource.parsers.json;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -9,9 +9,9 @@ import java.util.HashSet;
 import org.json.JSONArray;
 import org.json.JSONException;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta1.util.L;
-import com.gpl.rpg.AndorsTrail_beta1.util.Pair;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.util.L;
+import com.gpl.rpg.AndorsTrail.util.Pair;
 
 public abstract class JsonCollectionParserFor<T> extends JsonParserFor<Pair<String, T>> {
 	public HashSet<String> parseRows(String input, HashMap<String, T> dest) {
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/parsers/json/JsonFieldNames.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/json/JsonFieldNames.java
similarity index 99%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/parsers/json/JsonFieldNames.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/json/JsonFieldNames.java
index a3c3de5a0..7f784b84a 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/parsers/json/JsonFieldNames.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/json/JsonFieldNames.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.resource.parsers.json;
+package com.gpl.rpg.AndorsTrail.resource.parsers.json;
 
 public final class JsonFieldNames {
 	public static final class ActorCondition {
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/parsers/json/JsonParserFor.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/json/JsonParserFor.java
similarity index 88%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/parsers/json/JsonParserFor.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/json/JsonParserFor.java
index 124886f87..db5c2078c 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/parsers/json/JsonParserFor.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/json/JsonParserFor.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.resource.parsers.json;
+package com.gpl.rpg.AndorsTrail.resource.parsers.json;
 
 import java.util.ArrayList;
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/tiles/ResourceFileTileset.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/ResourceFileTileset.java
similarity index 90%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/tiles/ResourceFileTileset.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/ResourceFileTileset.java
index a42c9e11c..a4a7c0e62 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/tiles/ResourceFileTileset.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/ResourceFileTileset.java
@@ -1,9 +1,9 @@
-package com.gpl.rpg.AndorsTrail_beta1.resource.tiles;
+package com.gpl.rpg.AndorsTrail.resource.tiles;
 
 import android.graphics.Matrix;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta1.util.Size;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.util.Size;
 
 public final class ResourceFileTileset {
 	public final int resourceID;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/tiles/TileCache.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileCache.java
similarity index 97%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/tiles/TileCache.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileCache.java
index 36e9bb3ba..0fde8963f 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/tiles/TileCache.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileCache.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.resource.tiles;
+package com.gpl.rpg.AndorsTrail.resource.tiles;
 
 import java.lang.ref.Reference;
 import java.lang.ref.ReferenceQueue;
@@ -12,7 +12,7 @@ import android.graphics.Bitmap;
 import android.util.SparseArray;
 import android.util.SparseIntArray;
 
-import com.gpl.rpg.AndorsTrail_beta1.util.LruCache;
+import com.gpl.rpg.AndorsTrail.util.LruCache;
 
 public final class TileCache {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/tiles/TileCollection.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileCollection.java
similarity index 91%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/tiles/TileCollection.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileCollection.java
index 86418a213..189a2b646 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/tiles/TileCollection.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileCollection.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.resource.tiles;
+package com.gpl.rpg.AndorsTrail.resource.tiles;
 
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/tiles/TileCutter.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileCutter.java
similarity index 96%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/tiles/TileCutter.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileCutter.java
index 8851c2f78..b8efddd81 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/tiles/TileCutter.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileCutter.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.resource.tiles;
+package com.gpl.rpg.AndorsTrail.resource.tiles;
 
 import android.content.res.Resources;
 import android.graphics.Bitmap;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/tiles/TileManager.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileManager.java
similarity index 95%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/tiles/TileManager.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileManager.java
index 35dda1421..56f17d1e3 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/resource/tiles/TileManager.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileManager.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.resource.tiles;
+package com.gpl.rpg.AndorsTrail.resource.tiles;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -18,22 +18,22 @@ import android.os.AsyncTask;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailPreferences;
-import com.gpl.rpg.AndorsTrail_beta1.R;
-import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.ActorConditionType;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Monster;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Player;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.Inventory;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemContainer;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemContainer.ItemEntry;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemType;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.LayeredTileMap;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.MapObject;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.MonsterSpawnArea;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.PredefinedMap;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.TMXMapTranslator;
-import com.gpl.rpg.AndorsTrail_beta1.util.ThemeHelper;
+import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionType;
+import com.gpl.rpg.AndorsTrail.model.actor.Monster;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.model.item.Inventory;
+import com.gpl.rpg.AndorsTrail.model.item.ItemContainer;
+import com.gpl.rpg.AndorsTrail.model.item.ItemContainer.ItemEntry;
+import com.gpl.rpg.AndorsTrail.model.item.ItemType;
+import com.gpl.rpg.AndorsTrail.model.map.LayeredTileMap;
+import com.gpl.rpg.AndorsTrail.model.map.MapObject;
+import com.gpl.rpg.AndorsTrail.model.map.MonsterSpawnArea;
+import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
+import com.gpl.rpg.AndorsTrail.model.map.TMXMapTranslator;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
 
 public final class TileManager {
 	
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/savegames/LegacySavegameFormatReaderForItemContainer.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/LegacySavegameFormatReaderForItemContainer.java
similarity index 72%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/savegames/LegacySavegameFormatReaderForItemContainer.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/LegacySavegameFormatReaderForItemContainer.java
index be1517692..45b9eb0a3 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/savegames/LegacySavegameFormatReaderForItemContainer.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/LegacySavegameFormatReaderForItemContainer.java
@@ -1,12 +1,12 @@
-package com.gpl.rpg.AndorsTrail_beta1.savegames;
+package com.gpl.rpg.AndorsTrail.savegames;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.Inventory;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemContainer;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemContainer.ItemEntry;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemType;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.Loot;
-import com.gpl.rpg.AndorsTrail_beta1.util.L;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.model.item.Inventory;
+import com.gpl.rpg.AndorsTrail.model.item.ItemContainer;
+import com.gpl.rpg.AndorsTrail.model.item.ItemContainer.ItemEntry;
+import com.gpl.rpg.AndorsTrail.model.item.ItemType;
+import com.gpl.rpg.AndorsTrail.model.item.Loot;
+import com.gpl.rpg.AndorsTrail.util.L;
 
 public final class LegacySavegameFormatReaderForItemContainer {
 	public static void refundUpgradedItems(Inventory inventory) {
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/savegames/LegacySavegameFormatReaderForMap.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/LegacySavegameFormatReaderForMap.java
similarity index 99%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/savegames/LegacySavegameFormatReaderForMap.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/LegacySavegameFormatReaderForMap.java
index cec0dd14d..9c16165e4 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/savegames/LegacySavegameFormatReaderForMap.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/LegacySavegameFormatReaderForMap.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.savegames;
+package com.gpl.rpg.AndorsTrail.savegames;
 
 public final class LegacySavegameFormatReaderForMap {
 	public static String getMapnameFromIndex(int index) {
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/savegames/LegacySavegameFormatReaderForMonster.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/LegacySavegameFormatReaderForMonster.java
similarity index 65%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/savegames/LegacySavegameFormatReaderForMonster.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/LegacySavegameFormatReaderForMonster.java
index 7060d0040..4729a6275 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/savegames/LegacySavegameFormatReaderForMonster.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/LegacySavegameFormatReaderForMonster.java
@@ -1,12 +1,12 @@
-package com.gpl.rpg.AndorsTrail_beta1.savegames;
+package com.gpl.rpg.AndorsTrail.savegames;
 
 import java.io.DataInputStream;
 import java.io.IOException;
 
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Monster;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.MonsterType;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.MonsterSpawnArea;
-import com.gpl.rpg.AndorsTrail_beta1.util.Coord;
+import com.gpl.rpg.AndorsTrail.model.actor.Monster;
+import com.gpl.rpg.AndorsTrail.model.actor.MonsterType;
+import com.gpl.rpg.AndorsTrail.model.map.MonsterSpawnArea;
+import com.gpl.rpg.AndorsTrail.util.Coord;
 
 public final class LegacySavegameFormatReaderForMonster {
 	public static Monster newFromParcel_pre_v25(DataInputStream src, int fileversion, MonsterType monsterType, MonsterSpawnArea area) throws IOException {
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/savegames/LegacySavegameFormatReaderForPlayer.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/LegacySavegameFormatReaderForPlayer.java
similarity index 90%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/savegames/LegacySavegameFormatReaderForPlayer.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/LegacySavegameFormatReaderForPlayer.java
index 938ee9d85..d35fa0688 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/savegames/LegacySavegameFormatReaderForPlayer.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/LegacySavegameFormatReaderForPlayer.java
@@ -1,20 +1,20 @@
-package com.gpl.rpg.AndorsTrail_beta1.savegames;
+package com.gpl.rpg.AndorsTrail.savegames;
 
 import java.io.DataInputStream;
 import java.io.IOException;
 
-import com.gpl.rpg.AndorsTrail_beta1.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta1.controller.Constants;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.ActorConditionEffect;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.SkillInfo;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Player;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.Inventory;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemType;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.MonsterSpawnArea;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.PredefinedMap;
-import com.gpl.rpg.AndorsTrail_beta1.model.quest.QuestProgress;
-import com.gpl.rpg.AndorsTrail_beta1.util.Range;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.controller.Constants;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionEffect;
+import com.gpl.rpg.AndorsTrail.model.ability.SkillInfo;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.model.item.Inventory;
+import com.gpl.rpg.AndorsTrail.model.item.ItemType;
+import com.gpl.rpg.AndorsTrail.model.map.MonsterSpawnArea;
+import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
+import com.gpl.rpg.AndorsTrail.model.quest.QuestProgress;
+import com.gpl.rpg.AndorsTrail.util.Range;
 
 public final class LegacySavegameFormatReaderForPlayer {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/savegames/LegacySavegamesContentAdaptations.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/LegacySavegamesContentAdaptations.java
similarity index 75%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/savegames/LegacySavegamesContentAdaptations.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/LegacySavegamesContentAdaptations.java
index 25b3252ae..d1ac97d09 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/savegames/LegacySavegamesContentAdaptations.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/LegacySavegamesContentAdaptations.java
@@ -1,18 +1,18 @@
-package com.gpl.rpg.AndorsTrail_beta1.savegames;
+package com.gpl.rpg.AndorsTrail.savegames;
 
 import java.io.IOException;
 import java.util.LinkedList;
 import java.util.List;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta1.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta1.controller.WorldMapController;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Monster;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.MonsterSpawnArea;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.PredefinedMap;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.WorldMapSegment;
-import com.gpl.rpg.AndorsTrail_beta1.util.L;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.controller.WorldMapController;
+import com.gpl.rpg.AndorsTrail.model.actor.Monster;
+import com.gpl.rpg.AndorsTrail.model.map.MonsterSpawnArea;
+import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
+import com.gpl.rpg.AndorsTrail.model.map.WorldMapSegment;
+import com.gpl.rpg.AndorsTrail.util.L;
 
 import android.content.res.Resources;
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/savegames/Savegames.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/Savegames.java
similarity index 96%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/savegames/Savegames.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/Savegames.java
index 6a62e4df5..ade6f155f 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/savegames/Savegames.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/Savegames.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.savegames;
+package com.gpl.rpg.AndorsTrail.savegames;
 
 import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
@@ -22,15 +22,15 @@ import android.content.Context;
 import android.content.res.Resources;
 import android.os.SystemClock;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta1.R;
-import com.gpl.rpg.AndorsTrail_beta1.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta1.controller.Constants;
-import com.gpl.rpg.AndorsTrail_beta1.model.ModelContainer;
-import com.gpl.rpg.AndorsTrail_beta1.resource.tiles.TileManager;
-import com.gpl.rpg.AndorsTrail_beta1.util.AndroidStorage;
-import com.gpl.rpg.AndorsTrail_beta1.util.L;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.controller.Constants;
+import com.gpl.rpg.AndorsTrail.model.ModelContainer;
+import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
+import com.gpl.rpg.AndorsTrail.util.AndroidStorage;
+import com.gpl.rpg.AndorsTrail.util.L;
 
 public final class Savegames {
 	public static final int SLOT_QUICKSAVE = 0;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/util/AndroidStorage.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/AndroidStorage.java
similarity index 97%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/util/AndroidStorage.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/AndroidStorage.java
index f0ebd7d09..409023c60 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/util/AndroidStorage.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/AndroidStorage.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.util;
+package com.gpl.rpg.AndorsTrail.util;
 
 import android.content.Context;
 import android.net.Uri;
@@ -6,7 +6,7 @@ import android.os.Build;
 import android.os.Environment;
 import android.support.v4.content.FileProvider;
 
-import com.gpl.rpg.AndorsTrail_beta1.controller.Constants;
+import com.gpl.rpg.AndorsTrail.controller.Constants;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/util/Base64.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/Base64.java
similarity index 99%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/util/Base64.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/Base64.java
index 57f4aadcc..f44c09498 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/util/Base64.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/Base64.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.util;
+package com.gpl.rpg.AndorsTrail.util;
 
 public final class Base64 {
 	private static final byte[] encodingTable = { (byte) 'A', (byte) 'B',
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/util/ByteUtils.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/ByteUtils.java
similarity index 94%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/util/ByteUtils.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/ByteUtils.java
index ff6444444..2854a9ba7 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/util/ByteUtils.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/ByteUtils.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.util;
+package com.gpl.rpg.AndorsTrail.util;
 
 public final class ByteUtils {
 	public static String toHexString(byte[] bytes) { return toHexString(bytes, bytes.length); }
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/util/ConstRange.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/ConstRange.java
similarity index 95%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/util/ConstRange.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/ConstRange.java
index b6541500d..72d97eb85 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/util/ConstRange.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/ConstRange.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.util;
+package com.gpl.rpg.AndorsTrail.util;
 
 
 public final class ConstRange {
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/util/Coord.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/Coord.java
similarity index 97%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/util/Coord.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/Coord.java
index b345274e6..55ba445fb 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/util/Coord.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/Coord.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.util;
+package com.gpl.rpg.AndorsTrail.util;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/util/CoordRect.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/CoordRect.java
similarity index 98%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/util/CoordRect.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/CoordRect.java
index 34dbe421e..d83843dfc 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/util/CoordRect.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/CoordRect.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.util;
+package com.gpl.rpg.AndorsTrail.util;
 
 public final class CoordRect {
 	public final Coord topLeft;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/util/L.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/L.java
similarity index 67%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/util/L.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/L.java
index dd701f669..f6f11adb9 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/util/L.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/L.java
@@ -1,8 +1,8 @@
-package com.gpl.rpg.AndorsTrail_beta1.util;
+package com.gpl.rpg.AndorsTrail.util;
 
 import android.util.Log;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 
 public final class L {
 	private static final String TAG = "AndorsTrail";
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/util/ListOfListeners.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/ListOfListeners.java
similarity index 95%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/util/ListOfListeners.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/ListOfListeners.java
index 00228ea92..c07f586a5 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/util/ListOfListeners.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/ListOfListeners.java
@@ -1,9 +1,9 @@
-package com.gpl.rpg.AndorsTrail_beta1.util;
+package com.gpl.rpg.AndorsTrail.util;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 
 public class ListOfListeners<T> {
 	private final ArrayList<WeakReference<T>> listeners = new ArrayList<WeakReference<T>>();
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/util/LruCache.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/LruCache.java
similarity index 99%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/util/LruCache.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/LruCache.java
index 0f2ed3c28..b9a25a39b 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/util/LruCache.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/LruCache.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.gpl.rpg.AndorsTrail_beta1.util;
+package com.gpl.rpg.AndorsTrail.util;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/util/Pair.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/Pair.java
similarity index 85%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/util/Pair.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/Pair.java
index 8e07eb13a..663dc10c7 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/util/Pair.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/Pair.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.util;
+package com.gpl.rpg.AndorsTrail.util;
 
 // Should really use android.util.Pair<> instead, but it is not available for API level 4 (Android 1.6).
 public final class Pair<T1, T2> {
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/util/Range.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/Range.java
similarity index 98%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/util/Range.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/Range.java
index 0c2ded64f..fb0229ca1 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/util/Range.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/Range.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.util;
+package com.gpl.rpg.AndorsTrail.util;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/util/Size.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/Size.java
similarity index 95%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/util/Size.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/Size.java
index 99bd1b9ef..df2a66a87 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/util/Size.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/Size.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.util;
+package com.gpl.rpg.AndorsTrail.util;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/util/ThemeHelper.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/ThemeHelper.java
similarity index 96%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/util/ThemeHelper.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/ThemeHelper.java
index 76e888a38..0ea9bf812 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/util/ThemeHelper.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/ThemeHelper.java
@@ -1,9 +1,9 @@
-package com.gpl.rpg.AndorsTrail_beta1.util;
+package com.gpl.rpg.AndorsTrail.util;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import com.gpl.rpg.AndorsTrail_beta1.R;
+import com.gpl.rpg.AndorsTrail.R;
 
 import android.content.Context;
 import android.content.res.TypedArray;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/util/TimedMessageTask.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/TimedMessageTask.java
similarity index 97%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/util/TimedMessageTask.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/TimedMessageTask.java
index efdeb7337..507cd8d01 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/util/TimedMessageTask.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/TimedMessageTask.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.util;
+package com.gpl.rpg.AndorsTrail.util;
 
 import android.os.Handler;
 import android.os.Message;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/util/XmlResourceParserUtils.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/XmlResourceParserUtils.java
similarity index 95%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/util/XmlResourceParserUtils.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/XmlResourceParserUtils.java
index 07cb7cbc7..ddfbf9bb0 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/util/XmlResourceParserUtils.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/XmlResourceParserUtils.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.util;
+package com.gpl.rpg.AndorsTrail.util;
 
 import java.io.IOException;
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/AbilityModifierInfoView.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/AbilityModifierInfoView.java
similarity index 97%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/AbilityModifierInfoView.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/AbilityModifierInfoView.java
index 6688f703a..019f46e91 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/AbilityModifierInfoView.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/AbilityModifierInfoView.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.view;
+package com.gpl.rpg.AndorsTrail.view;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -7,8 +7,8 @@ import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.gpl.rpg.AndorsTrail_beta1.R;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.traits.AbilityModifierTraits;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.model.ability.traits.AbilityModifierTraits;
 
 public final class AbilityModifierInfoView extends LinearLayout {
 	private final TextView abilitymodifierinfo_change_maxap;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/ActorConditionEffectList.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ActorConditionEffectList.java
similarity index 87%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/ActorConditionEffectList.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ActorConditionEffectList.java
index 5841a21f8..7030a2caa 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/ActorConditionEffectList.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ActorConditionEffectList.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.view;
+package com.gpl.rpg.AndorsTrail.view;
 
 import java.util.Collection;
 
@@ -11,11 +11,11 @@ import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.gpl.rpg.AndorsTrail_beta1.Dialogs;
-import com.gpl.rpg.AndorsTrail_beta1.R;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.ActorCondition;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.ActorConditionEffect;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.ActorConditionType;
+import com.gpl.rpg.AndorsTrail.Dialogs;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorCondition;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionEffect;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionType;
 
 public final class ActorConditionEffectList extends LinearLayout {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/ActorConditionList.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ActorConditionList.java
similarity index 81%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/ActorConditionList.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ActorConditionList.java
index 104797e7b..85eed77b3 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/ActorConditionList.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ActorConditionList.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.view;
+package com.gpl.rpg.AndorsTrail.view;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -9,14 +9,14 @@ import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta1.Dialogs;
-import com.gpl.rpg.AndorsTrail_beta1.R;
-import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.ActorCondition;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.ActorConditionEffect;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.ActorConditionType;
-import com.gpl.rpg.AndorsTrail_beta1.util.ConstRange;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.Dialogs;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorCondition;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionEffect;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionType;
+import com.gpl.rpg.AndorsTrail.util.ConstRange;
 
 public final class ActorConditionList extends LinearLayout {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/CloudsAnimatorView.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CloudsAnimatorView.java
similarity index 98%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/CloudsAnimatorView.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CloudsAnimatorView.java
index 49aa759ea..53dcfba4d 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/CloudsAnimatorView.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CloudsAnimatorView.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.view;
+package com.gpl.rpg.AndorsTrail.view;
 
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -14,7 +14,7 @@ import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
 
-import com.gpl.rpg.AndorsTrail_beta1.R;
+import com.gpl.rpg.AndorsTrail.R;
 
 public class CloudsAnimatorView extends FrameLayout {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/CombatView.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CombatView.java
similarity index 92%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/CombatView.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CombatView.java
index 1c10c0da3..68e277446 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/CombatView.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CombatView.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.view;
+package com.gpl.rpg.AndorsTrail.view;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -14,22 +14,22 @@ import android.widget.ImageButton;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailPreferences;
-import com.gpl.rpg.AndorsTrail_beta1.Dialogs;
-import com.gpl.rpg.AndorsTrail_beta1.R;
-import com.gpl.rpg.AndorsTrail_beta1.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta1.controller.CombatController;
-import com.gpl.rpg.AndorsTrail_beta1.controller.listeners.ActorConditionListener;
-import com.gpl.rpg.AndorsTrail_beta1.controller.listeners.ActorStatsListener;
-import com.gpl.rpg.AndorsTrail_beta1.controller.listeners.CombatSelectionListener;
-import com.gpl.rpg.AndorsTrail_beta1.controller.listeners.CombatTurnListener;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.ActorCondition;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Actor;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Monster;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Player;
-import com.gpl.rpg.AndorsTrail_beta1.util.Coord;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences;
+import com.gpl.rpg.AndorsTrail.Dialogs;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.controller.CombatController;
+import com.gpl.rpg.AndorsTrail.controller.listeners.ActorConditionListener;
+import com.gpl.rpg.AndorsTrail.controller.listeners.ActorStatsListener;
+import com.gpl.rpg.AndorsTrail.controller.listeners.CombatSelectionListener;
+import com.gpl.rpg.AndorsTrail.controller.listeners.CombatTurnListener;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorCondition;
+import com.gpl.rpg.AndorsTrail.model.actor.Actor;
+import com.gpl.rpg.AndorsTrail.model.actor.Monster;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.util.Coord;
 
 public final class CombatView extends RelativeLayout implements CombatSelectionListener, CombatTurnListener, ActorStatsListener, ActorConditionListener {
 	private final RangeBar playerAPBar;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/CustomDialogFactory.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CustomDialogFactory.java
similarity index 96%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/CustomDialogFactory.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CustomDialogFactory.java
index edc527f4e..d554f2885 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/CustomDialogFactory.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CustomDialogFactory.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.view;
+package com.gpl.rpg.AndorsTrail.view;
 
 import android.app.Dialog;
 import android.content.Context;
@@ -17,9 +17,9 @@ import android.view.WindowManager;
 import android.widget.Button;
 import android.widget.TextView;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta1.R;
-import com.gpl.rpg.AndorsTrail_beta1.util.ThemeHelper;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
 
 public class CustomDialogFactory {
 	
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/CustomListPreference.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CustomListPreference.java
similarity index 95%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/CustomListPreference.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CustomListPreference.java
index ab6a10730..eef6c7b22 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/CustomListPreference.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CustomListPreference.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.view;
+package com.gpl.rpg.AndorsTrail.view;
 
 import android.app.Dialog;
 import android.content.Context;
@@ -11,8 +11,8 @@ import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.ListView;
 
-import com.gpl.rpg.AndorsTrail_beta1.R;
-import com.gpl.rpg.AndorsTrail_beta1.view.CustomDialogFactory.CustomDialog;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory.CustomDialog;
 
 public class CustomListPreference extends ListPreference {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/CustomMenuInflater.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CustomMenuInflater.java
similarity index 98%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/CustomMenuInflater.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CustomMenuInflater.java
index f91127fed..b31b7a519 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/CustomMenuInflater.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CustomMenuInflater.java
@@ -1,10 +1,10 @@
-package com.gpl.rpg.AndorsTrail_beta1.view;
+package com.gpl.rpg.AndorsTrail.view;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import com.gpl.rpg.AndorsTrail_beta1.R;
-import com.gpl.rpg.AndorsTrail_beta1.view.CustomDialogFactory.CustomDialog;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory.CustomDialog;
 
 import android.app.Activity;
 import android.app.Dialog;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/DisplayActiveActorConditionIcons.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/DisplayActiveActorConditionIcons.java
similarity index 95%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/DisplayActiveActorConditionIcons.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/DisplayActiveActorConditionIcons.java
index fb8c70345..657c07e7c 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/DisplayActiveActorConditionIcons.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/DisplayActiveActorConditionIcons.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.view;
+package com.gpl.rpg.AndorsTrail.view;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
@@ -13,15 +13,15 @@ import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.RelativeLayout.LayoutParams;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailPreferences;
-import com.gpl.rpg.AndorsTrail_beta1.R;
-import com.gpl.rpg.AndorsTrail_beta1.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta1.controller.listeners.ActorConditionListener;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.ActorCondition;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Actor;
-import com.gpl.rpg.AndorsTrail_beta1.resource.tiles.TileManager;
-import com.gpl.rpg.AndorsTrail_beta1.util.ThemeHelper;
+import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.controller.listeners.ActorConditionListener;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorCondition;
+import com.gpl.rpg.AndorsTrail.model.actor.Actor;
+import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
 
 public final class DisplayActiveActorConditionIcons implements ActorConditionListener {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/ItemContainerAdapter.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemContainerAdapter.java
similarity index 85%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/ItemContainerAdapter.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemContainerAdapter.java
index 68bf28c1a..0b22b5e19 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/ItemContainerAdapter.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemContainerAdapter.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.view;
+package com.gpl.rpg.AndorsTrail.view;
 
 import android.content.Context;
 import android.view.View;
@@ -6,13 +6,13 @@ import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.TextView;
 
-import com.gpl.rpg.AndorsTrail_beta1.R;
-import com.gpl.rpg.AndorsTrail_beta1.controller.ItemController;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Player;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemContainer;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemContainer.ItemEntry;
-import com.gpl.rpg.AndorsTrail_beta1.resource.tiles.TileCollection;
-import com.gpl.rpg.AndorsTrail_beta1.resource.tiles.TileManager;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.controller.ItemController;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.model.item.ItemContainer;
+import com.gpl.rpg.AndorsTrail.model.item.ItemContainer.ItemEntry;
+import com.gpl.rpg.AndorsTrail.resource.tiles.TileCollection;
+import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
 
 public class ItemContainerAdapter extends ArrayAdapter<ItemEntry> {
 	private final TileManager tileManager;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/ItemEffectsView.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemEffectsView.java
similarity index 93%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/ItemEffectsView.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemEffectsView.java
index a5e59f811..6452cae7d 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/ItemEffectsView.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemEffectsView.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.view;
+package com.gpl.rpg.AndorsTrail.view;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -9,10 +9,10 @@ import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.gpl.rpg.AndorsTrail_beta1.R;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemTraits_OnEquip;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemTraits_OnHitReceived;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemTraits_OnUse;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnEquip;
+import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnHitReceived;
+import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnUse;
 
 public final class ItemEffectsView extends LinearLayout {
 	private final TextView itemeffect_onequip_title;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/ItemEffectsView_OnDeath.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemEffectsView_OnDeath.java
similarity index 91%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/ItemEffectsView_OnDeath.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemEffectsView_OnDeath.java
index 9506c54a5..1f680a9cc 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/ItemEffectsView_OnDeath.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemEffectsView_OnDeath.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.view;
+package com.gpl.rpg.AndorsTrail.view;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -10,10 +10,10 @@ import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.gpl.rpg.AndorsTrail_beta1.R;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.ActorConditionEffect;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.traits.StatsModifierTraits;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemTraits_OnUse;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionEffect;
+import com.gpl.rpg.AndorsTrail.model.ability.traits.StatsModifierTraits;
+import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnUse;
 
 public final class ItemEffectsView_OnDeath extends LinearLayout {
 	private final LinearLayout itemeffect_ondeath_ontarget_list;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/ItemEffectsView_OnHitReceived.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemEffectsView_OnHitReceived.java
similarity index 93%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/ItemEffectsView_OnHitReceived.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemEffectsView_OnHitReceived.java
index 9201be51b..03703fdeb 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/ItemEffectsView_OnHitReceived.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemEffectsView_OnHitReceived.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.view;
+package com.gpl.rpg.AndorsTrail.view;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -11,10 +11,10 @@ import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.gpl.rpg.AndorsTrail_beta1.R;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.ActorConditionEffect;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.traits.StatsModifierTraits;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemTraits_OnHitReceived;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionEffect;
+import com.gpl.rpg.AndorsTrail.model.ability.traits.StatsModifierTraits;
+import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnHitReceived;
 
 public final class ItemEffectsView_OnHitReceived extends LinearLayout {
 	private final LinearLayout itemeffect_onhitreceived_onsource_list;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/ItemEffectsView_OnUse.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemEffectsView_OnUse.java
similarity index 92%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/ItemEffectsView_OnUse.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemEffectsView_OnUse.java
index f21c9eb75..3ddd2de09 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/ItemEffectsView_OnUse.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemEffectsView_OnUse.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.view;
+package com.gpl.rpg.AndorsTrail.view;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -11,10 +11,10 @@ import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.gpl.rpg.AndorsTrail_beta1.R;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.ActorConditionEffect;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.traits.StatsModifierTraits;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemTraits_OnUse;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionEffect;
+import com.gpl.rpg.AndorsTrail.model.ability.traits.StatsModifierTraits;
+import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnUse;
 
 public final class ItemEffectsView_OnUse extends LinearLayout {
 	private final LinearLayout itemeffect_onuse_list;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/MainView.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/MainView.java
similarity index 93%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/MainView.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/MainView.java
index d12dede34..69cd77d99 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/MainView.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/MainView.java
@@ -1,35 +1,35 @@
-package com.gpl.rpg.AndorsTrail_beta1.view;
+package com.gpl.rpg.AndorsTrail.view;
 
 import java.lang.ref.WeakReference;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailPreferences;
-import com.gpl.rpg.AndorsTrail_beta1.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta1.controller.Constants;
-import com.gpl.rpg.AndorsTrail_beta1.controller.InputController;
-import com.gpl.rpg.AndorsTrail_beta1.controller.VisualEffectController.BloodSplatter;
-import com.gpl.rpg.AndorsTrail_beta1.controller.VisualEffectController.SpriteMoveAnimation;
-import com.gpl.rpg.AndorsTrail_beta1.controller.VisualEffectController.VisualEffectAnimation;
-import com.gpl.rpg.AndorsTrail_beta1.controller.listeners.CombatSelectionListener;
-import com.gpl.rpg.AndorsTrail_beta1.controller.listeners.GameRoundListener;
-import com.gpl.rpg.AndorsTrail_beta1.controller.listeners.MapLayoutListener;
-import com.gpl.rpg.AndorsTrail_beta1.controller.listeners.MonsterMovementListener;
-import com.gpl.rpg.AndorsTrail_beta1.controller.listeners.MonsterSpawnListener;
-import com.gpl.rpg.AndorsTrail_beta1.controller.listeners.PlayerMovementListener;
-import com.gpl.rpg.AndorsTrail_beta1.controller.listeners.VisualEffectFrameListener;
-import com.gpl.rpg.AndorsTrail_beta1.model.ModelContainer;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Monster;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.Loot;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.LayeredTileMap;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.MapLayer;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.MonsterSpawnArea;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.PredefinedMap;
-import com.gpl.rpg.AndorsTrail_beta1.resource.tiles.TileCollection;
-import com.gpl.rpg.AndorsTrail_beta1.resource.tiles.TileManager;
-import com.gpl.rpg.AndorsTrail_beta1.util.Coord;
-import com.gpl.rpg.AndorsTrail_beta1.util.CoordRect;
-import com.gpl.rpg.AndorsTrail_beta1.util.Size;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.controller.Constants;
+import com.gpl.rpg.AndorsTrail.controller.InputController;
+import com.gpl.rpg.AndorsTrail.controller.VisualEffectController.BloodSplatter;
+import com.gpl.rpg.AndorsTrail.controller.VisualEffectController.SpriteMoveAnimation;
+import com.gpl.rpg.AndorsTrail.controller.VisualEffectController.VisualEffectAnimation;
+import com.gpl.rpg.AndorsTrail.controller.listeners.CombatSelectionListener;
+import com.gpl.rpg.AndorsTrail.controller.listeners.GameRoundListener;
+import com.gpl.rpg.AndorsTrail.controller.listeners.MapLayoutListener;
+import com.gpl.rpg.AndorsTrail.controller.listeners.MonsterMovementListener;
+import com.gpl.rpg.AndorsTrail.controller.listeners.MonsterSpawnListener;
+import com.gpl.rpg.AndorsTrail.controller.listeners.PlayerMovementListener;
+import com.gpl.rpg.AndorsTrail.controller.listeners.VisualEffectFrameListener;
+import com.gpl.rpg.AndorsTrail.model.ModelContainer;
+import com.gpl.rpg.AndorsTrail.model.actor.Monster;
+import com.gpl.rpg.AndorsTrail.model.item.Loot;
+import com.gpl.rpg.AndorsTrail.model.map.LayeredTileMap;
+import com.gpl.rpg.AndorsTrail.model.map.MapLayer;
+import com.gpl.rpg.AndorsTrail.model.map.MonsterSpawnArea;
+import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
+import com.gpl.rpg.AndorsTrail.resource.tiles.TileCollection;
+import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
+import com.gpl.rpg.AndorsTrail.util.Coord;
+import com.gpl.rpg.AndorsTrail.util.CoordRect;
+import com.gpl.rpg.AndorsTrail.util.Size;
 
 import android.content.Context;
 import android.graphics.Canvas;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/QuickButton.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/QuickButton.java
similarity index 87%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/QuickButton.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/QuickButton.java
index 0fabdb4fc..cd926cf9a 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/QuickButton.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/QuickButton.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.view;
+package com.gpl.rpg.AndorsTrail.view;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -8,11 +8,11 @@ import android.util.AttributeSet;
 import android.view.ContextMenu;
 import android.widget.Button;
 
-import com.gpl.rpg.AndorsTrail_beta1.R;
-import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemType;
-import com.gpl.rpg.AndorsTrail_beta1.resource.tiles.TileCollection;
-import com.gpl.rpg.AndorsTrail_beta1.resource.tiles.TileManager;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.model.item.ItemType;
+import com.gpl.rpg.AndorsTrail.resource.tiles.TileCollection;
+import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
 
 public final class QuickButton extends Button {
 	private final ColorFilter grayScaleFilter = new ColorMatrixColorFilter(
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/QuickitemView.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/QuickitemView.java
similarity index 89%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/QuickitemView.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/QuickitemView.java
index 20ea4f85a..c66919c13 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/QuickitemView.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/QuickitemView.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.view;
+package com.gpl.rpg.AndorsTrail.view;
 
 import java.util.HashSet;
 
@@ -12,16 +12,16 @@ import android.view.ViewGroup;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailPreferences;
-import com.gpl.rpg.AndorsTrail_beta1.R;
-import com.gpl.rpg.AndorsTrail_beta1.activity.MainActivity;
-import com.gpl.rpg.AndorsTrail_beta1.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta1.controller.listeners.QuickSlotListener;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.Inventory;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemType;
-import com.gpl.rpg.AndorsTrail_beta1.resource.tiles.TileCollection;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.activity.MainActivity;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.controller.listeners.QuickSlotListener;
+import com.gpl.rpg.AndorsTrail.model.item.Inventory;
+import com.gpl.rpg.AndorsTrail.model.item.ItemType;
+import com.gpl.rpg.AndorsTrail.resource.tiles.TileCollection;
 
 public final class QuickitemView extends LinearLayout implements OnClickListener, QuickSlotListener {
 	private static final int NUM_QUICK_SLOTS = Inventory.NUM_QUICK_SLOTS;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/QuickslotsItemContainerAdapter.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/QuickslotsItemContainerAdapter.java
similarity index 82%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/QuickslotsItemContainerAdapter.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/QuickslotsItemContainerAdapter.java
index f171a874b..55dd89b1a 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/QuickslotsItemContainerAdapter.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/QuickslotsItemContainerAdapter.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.view;
+package com.gpl.rpg.AndorsTrail.view;
 
 import android.content.Context;
 import android.graphics.ColorMatrix;
@@ -8,12 +8,12 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import com.gpl.rpg.AndorsTrail_beta1.R;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Player;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemContainer;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemContainer.ItemEntry;
-import com.gpl.rpg.AndorsTrail_beta1.resource.tiles.TileCollection;
-import com.gpl.rpg.AndorsTrail_beta1.resource.tiles.TileManager;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.model.item.ItemContainer;
+import com.gpl.rpg.AndorsTrail.model.item.ItemContainer.ItemEntry;
+import com.gpl.rpg.AndorsTrail.resource.tiles.TileCollection;
+import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
 
 public class QuickslotsItemContainerAdapter extends ItemContainerAdapter {
 	
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/RangeBar.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/RangeBar.java
similarity index 93%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/RangeBar.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/RangeBar.java
index 70b720ba8..60987ad86 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/RangeBar.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/RangeBar.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.view;
+package com.gpl.rpg.AndorsTrail.view;
 
 import android.content.Context;
 import android.util.AttributeSet;
@@ -6,8 +6,8 @@ import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.gpl.rpg.AndorsTrail_beta1.R;
-import com.gpl.rpg.AndorsTrail_beta1.util.Range;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.util.Range;
 
 public final class RangeBar extends RelativeLayout {
 	private final ProgressBar progressBar;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/SelectableTextView.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/SelectableTextView.java
similarity index 97%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/SelectableTextView.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/SelectableTextView.java
index 42cfef8a7..a2eb763f5 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/SelectableTextView.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/SelectableTextView.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.view;
+package com.gpl.rpg.AndorsTrail.view;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/ShopItemContainerAdapter.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ShopItemContainerAdapter.java
similarity index 84%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/ShopItemContainerAdapter.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ShopItemContainerAdapter.java
index 6c86cc6d3..8cc80fcf4 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/ShopItemContainerAdapter.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ShopItemContainerAdapter.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.view;
+package com.gpl.rpg.AndorsTrail.view;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -10,14 +10,14 @@ import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.gpl.rpg.AndorsTrail_beta1.R;
-import com.gpl.rpg.AndorsTrail_beta1.controller.ItemController;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Player;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemContainer;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemContainer.ItemEntry;
-import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemType;
-import com.gpl.rpg.AndorsTrail_beta1.resource.tiles.TileCollection;
-import com.gpl.rpg.AndorsTrail_beta1.resource.tiles.TileManager;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.controller.ItemController;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.model.item.ItemContainer;
+import com.gpl.rpg.AndorsTrail.model.item.ItemContainer.ItemEntry;
+import com.gpl.rpg.AndorsTrail.model.item.ItemType;
+import com.gpl.rpg.AndorsTrail.resource.tiles.TileCollection;
+import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
 
 public final class ShopItemContainerAdapter extends ArrayAdapter<ItemEntry> {
 	private final TileManager tileManager;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/SkillListAdapter.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/SkillListAdapter.java
similarity index 95%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/SkillListAdapter.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/SkillListAdapter.java
index 468660db7..cef4cfa19 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/SkillListAdapter.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/SkillListAdapter.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.view;
+package com.gpl.rpg.AndorsTrail.view;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -14,12 +14,12 @@ import android.widget.ArrayAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.gpl.rpg.AndorsTrail_beta1.R;
-import com.gpl.rpg.AndorsTrail_beta1.activity.SkillInfoActivity;
-import com.gpl.rpg.AndorsTrail_beta1.controller.SkillController;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.SkillCollection;
-import com.gpl.rpg.AndorsTrail_beta1.model.ability.SkillInfo;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.activity.SkillInfoActivity;
+import com.gpl.rpg.AndorsTrail.controller.SkillController;
+import com.gpl.rpg.AndorsTrail.model.ability.SkillCollection;
+import com.gpl.rpg.AndorsTrail.model.ability.SkillInfo;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
 
 public final class SkillListAdapter extends ArrayAdapter<SkillInfo> {
 	private final Resources r;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/SpinnerEmulator.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/SpinnerEmulator.java
similarity index 98%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/SpinnerEmulator.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/SpinnerEmulator.java
index 2d2ad252d..d3cec5082 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/SpinnerEmulator.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/SpinnerEmulator.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.view;
+package com.gpl.rpg.AndorsTrail.view;
 
 import android.app.Dialog;
 import android.content.Context;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/StatusView.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/StatusView.java
similarity index 85%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/StatusView.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/StatusView.java
index 5b2c5451e..10459aec6 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/StatusView.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/StatusView.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.view;
+package com.gpl.rpg.AndorsTrail.view;
 
 import android.content.Context;
 import android.content.Intent;
@@ -8,16 +8,16 @@ import android.view.View;
 import android.widget.ImageButton;
 import android.widget.RelativeLayout;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta1.R;
-import com.gpl.rpg.AndorsTrail_beta1.activity.HeroinfoActivity;
-import com.gpl.rpg.AndorsTrail_beta1.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta1.controller.listeners.ActorStatsListener;
-import com.gpl.rpg.AndorsTrail_beta1.controller.listeners.PlayerStatsListener;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Actor;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Player;
-import com.gpl.rpg.AndorsTrail_beta1.resource.tiles.TileManager;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.activity.HeroinfoActivity;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.controller.listeners.ActorStatsListener;
+import com.gpl.rpg.AndorsTrail.controller.listeners.PlayerStatsListener;
+import com.gpl.rpg.AndorsTrail.model.actor.Actor;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
 
 public final class StatusView extends RelativeLayout implements PlayerStatsListener, ActorStatsListener {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/ToolboxView.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ToolboxView.java
similarity index 91%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/ToolboxView.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ToolboxView.java
index bca13db4a..6d72fc30e 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/ToolboxView.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ToolboxView.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.view;
+package com.gpl.rpg.AndorsTrail.view;
 
 import android.app.Activity;
 import android.content.Context;
@@ -15,14 +15,14 @@ import android.view.animation.AnimationUtils;
 import android.widget.ImageButton;
 import android.widget.LinearLayout;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailPreferences;
-import com.gpl.rpg.AndorsTrail_beta1.Dialogs;
-import com.gpl.rpg.AndorsTrail_beta1.R;
-import com.gpl.rpg.AndorsTrail_beta1.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta1.controller.WorldMapController;
-import com.gpl.rpg.AndorsTrail_beta1.resource.tiles.TileManager;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences;
+import com.gpl.rpg.AndorsTrail.Dialogs;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.controller.WorldMapController;
+import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
 
 public final class ToolboxView extends LinearLayout implements OnClickListener {
 	private final WorldContext world;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/TraitsInfoView.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/TraitsInfoView.java
similarity index 95%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/TraitsInfoView.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/TraitsInfoView.java
index cf8cf6a79..bba515af4 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/TraitsInfoView.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/TraitsInfoView.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.view;
+package com.gpl.rpg.AndorsTrail.view;
 
 import android.view.View;
 import android.view.ViewGroup;
@@ -6,9 +6,9 @@ import android.widget.TableLayout;
 import android.widget.TableRow;
 import android.widget.TextView;
 
-import com.gpl.rpg.AndorsTrail_beta1.R;
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Actor;
-import com.gpl.rpg.AndorsTrail_beta1.util.Range;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.model.actor.Actor;
+import com.gpl.rpg.AndorsTrail.util.Range;
 
 public final class TraitsInfoView {
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/VirtualDpadView.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/VirtualDpadView.java
similarity index 93%
rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/VirtualDpadView.java
rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/VirtualDpadView.java
index 3c6e001ce..a989a0c98 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/view/VirtualDpadView.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/VirtualDpadView.java
@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta1.view;
+package com.gpl.rpg.AndorsTrail.view;
 
 import android.content.Context;
 import android.util.AttributeSet;
@@ -9,12 +9,12 @@ import android.view.ViewGroup.LayoutParams;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
 
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailPreferences;
-import com.gpl.rpg.AndorsTrail_beta1.R;
-import com.gpl.rpg.AndorsTrail_beta1.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta1.controller.InputController;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.controller.InputController;
 
 public final class VirtualDpadView extends ImageView implements OnClickListener {
 	private final WorldContext world;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/MapLayoutListener.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/MapLayoutListener.java
deleted file mode 100644
index d6db38b6a..000000000
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/MapLayoutListener.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.gpl.rpg.AndorsTrail_beta1.controller.listeners;
-
-import com.gpl.rpg.AndorsTrail_beta1.model.map.LayeredTileMap;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.PredefinedMap;
-import com.gpl.rpg.AndorsTrail_beta1.util.Coord;
-
-public interface MapLayoutListener {
-	void onLootBagCreated(PredefinedMap map, Coord p);
-	void onLootBagRemoved(PredefinedMap map, Coord p);
-	void onMapTilesChanged(PredefinedMap map, LayeredTileMap tileMap);
-}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/MonsterMovementListener.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/MonsterMovementListener.java
deleted file mode 100644
index 2d207d0bc..000000000
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/MonsterMovementListener.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.gpl.rpg.AndorsTrail_beta1.controller.listeners;
-
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Monster;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.PredefinedMap;
-import com.gpl.rpg.AndorsTrail_beta1.util.CoordRect;
-
-public interface MonsterMovementListener {
-	void onMonsterSteppedOnPlayer(Monster m);
-	void onMonsterMoved(PredefinedMap map, Monster m, CoordRect previousPosition);
-}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/PlayerStatsListener.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/PlayerStatsListener.java
deleted file mode 100644
index 09a4581e4..000000000
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/PlayerStatsListener.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.gpl.rpg.AndorsTrail_beta1.controller.listeners;
-
-import com.gpl.rpg.AndorsTrail_beta1.model.actor.Player;
-
-public interface PlayerStatsListener {
-	void onPlayerExperienceChanged(Player p);
-}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/MapBundle.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/MapBundle.java
deleted file mode 100644
index 742610735..000000000
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/MapBundle.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.gpl.rpg.AndorsTrail_beta1.model;
-
-import com.gpl.rpg.AndorsTrail_beta1.model.map.LayeredTileMap;
-import com.gpl.rpg.AndorsTrail_beta1.model.map.PredefinedMap;
-import com.gpl.rpg.AndorsTrail_beta1.resource.tiles.TileCollection;
-
-public final class MapBundle {
-	public PredefinedMap map;
-	public LayeredTileMap tileMap;
-	public TileCollection tiles;
-}