Reorganized file structure

AndroidManifest.xml

@@ -23,25 +23,30 @@ along with Yaaic.  If not, see <http://www.gnu.org/licenses/>.
       package="org.yaaic.client"
       android:versionCode="1" android:versionName="0.1.0">
     <application android:icon="@drawable/icon" android:label="@string/app_name" android:name="YaaicApplication">
-        <activity android:name=".ServerList"
+        <activity
+            android:name=".view.ServerListActivity"
             android:label="@string/app_name">
 	        <intent-filter>
 	            <action android:name="android.intent.action.MAIN" />
 	            <category android:name="android.intent.category.LAUNCHER" />
 	        </intent-filter>
         </activity>
-        <activity android:name=".ServerAdd"
+        <activity
+            android:name=".view.ServerAddActivity"
         	android:label="@string/server_add_title">
         </activity>
-        <activity android:name=".Settings"
+        <activity
+            android:name=".view.SettingsActivity"
         	android:label="@string/settings_title">
         </activity>
-        <activity android:name=".About"
+        <activity
+            android:name=".view.AboutActivity"
         	android:label="@string/about_title"
         	android:theme="@android:style/Theme.Dialog" >
         </activity>
-        <activity android:name=".ServerWindow"
+        <activity
-        		  android:label="ServerWindow">
+            android:name=".view.ServerActivity"
+        	android:label="">
         </activity>
      <service android:name=".irc.IrcService"/>
     </application>

src/org/yaaic/client/adapter/ServerListAdapter.java

@@ -18,8 +18,10 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with Yaaic.  If not, see <http://www.gnu.org/licenses/>.
 */
-package org.yaaic.client;
+package org.yaaic.client.adapter;
 
+import org.yaaic.client.R;
+import org.yaaic.client.R.id;
 import org.yaaic.client.irc.IrcBinder;
 
 import android.app.Activity;

src/org/yaaic/client/adapter/ServerWindowListAdapter.java

@@ -18,7 +18,9 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with Yaaic.  If not, see <http://www.gnu.org/licenses/>.
 */
-package org.yaaic.client;
+package org.yaaic.client.adapter;
+
+import org.yaaic.client.view.ServerActivity;
 
 import android.view.Gravity;
 import android.view.View;
@@ -34,10 +36,10 @@ import android.widget.TextView;
  */
 public class ServerWindowListAdapter extends BaseExpandableListAdapter
 {
-	private ServerWindow serverWindow;
+	private ServerActivity serverWindow;
 	private String[] groups = { "Channels (0)", "Queries (0)" };
 	
-	public ServerWindowListAdapter(ServerWindow serverWindow)
+	public ServerWindowListAdapter(ServerActivity serverWindow)
 	{
 		this.serverWindow = serverWindow;
 	}

src/org/yaaic/client/view/AboutActivity.java

@@ -18,7 +18,9 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with Yaaic.  If not, see <http://www.gnu.org/licenses/>.
 */
-package org.yaaic.client;
+package org.yaaic.client.view;
+
+import org.yaaic.client.R;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -28,7 +30,7 @@ import android.os.Bundle;
  * 
  * @author Sebastian Kaspari <s.kaspari@googlemail.com>
  */
-public class About extends Activity
+public class AboutActivity extends Activity
 {
 	@Override
 	protected void onCreate(Bundle savedInstanceState)

src/org/yaaic/client/view/ServerActivity.java

@@ -18,8 +18,10 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with Yaaic.  If not, see <http://www.gnu.org/licenses/>.
 */
-package org.yaaic.client;
+package org.yaaic.client.view;
 
+import org.yaaic.client.R;
+import org.yaaic.client.adapter.ServerWindowListAdapter;
 import org.yaaic.client.db.ServerConstants;
 import org.yaaic.client.db.ServerDatabase;
 import org.yaaic.client.irc.IrcBinder;
@@ -43,7 +45,7 @@ import android.widget.TextView;
  * 
  * @author Sebastian Kaspari <s.kaspari@googlemail.com>
  */
-public class ServerWindow extends ExpandableListActivity implements ServiceConnection
+public class ServerActivity extends ExpandableListActivity implements ServiceConnection
 {
 	private static final String TAG = "Yaaic/ServerWindow";
 	private IrcBinder binder;

src/org/yaaic/client/view/ServerAddActivity.java

@@ -18,8 +18,9 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with Yaaic.  If not, see <http://www.gnu.org/licenses/>.
 */
-package org.yaaic.client;
+package org.yaaic.client.view;
 
+import org.yaaic.client.R;
 import org.yaaic.client.db.ServerDatabase;
 
 import android.app.Activity;
@@ -35,7 +36,7 @@ import android.widget.EditText;
  * 
  * @author Sebastian Kaspari <s.kaspari@googlemail.com>
  */
-public class ServerAdd extends Activity implements OnClickListener
+public class ServerAddActivity extends Activity implements OnClickListener
 {
 	@Override
     public void onCreate(Bundle savedInstanceState)

src/org/yaaic/client/view/ServerListActivity.java

@@ -18,7 +18,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with Yaaic.  If not, see <http://www.gnu.org/licenses/>.
 */
-package org.yaaic.client;
+package org.yaaic.client.view;
 
 import android.app.AlertDialog;
 import android.app.ListActivity;
@@ -46,6 +46,8 @@ import android.widget.TextView;
 import android.widget.Toast;
 import android.widget.AdapterView.OnItemLongClickListener;
 
+import org.yaaic.client.R;
+import org.yaaic.client.adapter.ServerListAdapter;
 import org.yaaic.client.db.ServerConstants;
 import org.yaaic.client.db.ServerDatabase;
 import org.yaaic.client.irc.IrcBinder;
@@ -56,7 +58,7 @@ import org.yaaic.client.irc.IrcService;
  * 
  * @author Sebastian Kaspari <s.kaspari@googlemail.com>
  */
-public class ServerList extends ListActivity implements OnItemLongClickListener, ServiceConnection
+public class ServerListActivity extends ListActivity implements OnItemLongClickListener, ServiceConnection
 {
 	/**
 	 * Debugging/Log tag
@@ -179,7 +181,7 @@ public class ServerList extends ListActivity implements OnItemLongClickListener,
     {
     	TextView tv = (TextView) view.findViewById(R.id.server_title);
     	
-    	Intent serverIntent = new Intent(this, ServerWindow.class);
+    	Intent serverIntent = new Intent(this, ServerActivity.class);
     	serverIntent.putExtra("server_title", tv.getText());
     	startActivity(serverIntent);
     	//cursor.requery();
@@ -256,17 +258,17 @@ public class ServerList extends ListActivity implements OnItemLongClickListener,
     	{
     		// Add a new server
     		case R.id.server_add:
-    			Intent serverAddIntent = new Intent(this, ServerAdd.class);
+    			Intent serverAddIntent = new Intent(this, ServerAddActivity.class);
     			startActivity(serverAddIntent);
     			return true;
 			// Show settings
     		case R.id.settings:
-    			Intent settingsIntent = new Intent(this, Settings.class);
+    			Intent settingsIntent = new Intent(this, SettingsActivity.class);
     			startActivity(settingsIntent);
     			return true;
 			// Show about window
     		case R.id.about:
-    			Intent aboutIntent = new Intent(this, About.class);
+    			Intent aboutIntent = new Intent(this, AboutActivity.class);
     			startActivity(aboutIntent);
     			return true;
     	}

src/org/yaaic/client/view/SettingsActivity.java

@@ -18,7 +18,9 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with Yaaic.  If not, see <http://www.gnu.org/licenses/>.
 */
-package org.yaaic.client;
+package org.yaaic.client.view;
+
+import org.yaaic.client.R;
 
 import android.os.Bundle;
 import android.preference.PreferenceActivity;
@@ -28,7 +30,7 @@ import android.preference.PreferenceActivity;
  * 
  * @author Sebastian Kaspari <s.kaspari@googlemail.com>
  */
-public class Settings extends PreferenceActivity
+public class SettingsActivity extends PreferenceActivity
 {
 	@Override
 	public void onCreate(Bundle savedInstanceState)