diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index 0b61bfe..7e04563 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -131,78 +131,3 @@ MainWindow::toggleEQ (bool UpdateButton)
 		s.setValue ("equalizer/hidden", true);
 	} 
 }
-
-int 
-main (int argc, char **argv)
-{
-	QApplication app(argc, argv);
-
-	QCoreApplication::setOrganizationName("XMMS2 Team");
-	QCoreApplication::setOrganizationDomain("xmms.org");
-	QCoreApplication::setApplicationName("Promoe");
-
-	QSettings settings;
-
-#ifdef Q_OS_MACX 
-	/** This is soooo wrong, there must exsist a flag for
-	  * static plugins
-	Q_IMPORT_PLUGIN(QJpegPlugin);
-	  */
-#endif
-
-	MainWindow *mw = new MainWindow (NULL);
-
-	PlaylistWindow *playlistwin = new PlaylistWindow (mw);
-	EqualizerWindow *eqwin = new EqualizerWindow (mw);
-
-	/*
-	 * Now that everything is initialized
-	 * open the skin and send the
-	 * SkinChanged signal that will cause
-	 * all widgets to get their pixmaps
-	 */
-	if (!settings.contains ("skin/path")) {
-		settings.setValue ("skin/path", ":CleanAMP/");
-	}
-
-	Skin::getInstance()->setSkin (settings.value("skin/path").toString ());
-
-	mw->show ();
-	mw->setPL (playlistwin);
-	mw->setEQ (eqwin);
-
-	if (!settings.contains ("playlist/pos"))
-		settings.setValue ("playlist/pos", QPoint (mw->pos().x(),
-												   mw->pos().y()+mw->size().height()));
-	playlistwin->move (settings.value("playlist/pos").toPoint ());
-
-	if (!settings.contains ("playlist/hidden"))
-		settings.setValue ("playlist/hidden", true);
-
-	if (settings.value("playlist/hidden").toBool ())
-		playlistwin->hide ();
-	else
-		playlistwin->show ();
-
-
-	if (!settings.contains ("equalizer/pos"))
-		settings.setValue ("equalizer/pos", QPoint (mw->pos().x(),
-												   mw->pos().y()+mw->size().height()));
-	eqwin->move (settings.value("equalizer/pos").toPoint ());
-
-	if (!settings.contains ("equalizer/hidden"))
-		settings.setValue ("equalizer/hidden", true);
-
-	if (settings.value("equalizer/hidden").toBool ())
-		eqwin->hide ();
-	else
-		eqwin->show ();
-
-
-#ifdef HAVE_SERVERBROWSER
-	ServerBrowserWindow *browser = new ServerBrowserWindow (mw);
-	browser->show ();
-#endif
-
-	return app.exec();
-}
diff --git a/src/main.cpp b/src/main.cpp
new file mode 100644
index 0000000..42dd1a9
--- /dev/null
+++ b/src/main.cpp
@@ -0,0 +1,97 @@
+/**
+
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include "MainWindow.h"
+#include "playlist.h"
+#include "equalizer.h"
+#include "Skin.h"
+
+#ifdef HAVE_SERVERBROWSER
+#include "Serverbrowser.h"
+#endif
+
+#include <QSettings>
+
+int 
+main (int argc, char **argv)
+{
+	QApplication app(argc, argv);
+
+	QCoreApplication::setOrganizationName("XMMS2 Team");
+	QCoreApplication::setOrganizationDomain("xmms.org");
+	QCoreApplication::setApplicationName("Promoe");
+
+	QSettings settings;
+
+#ifdef Q_OS_MACX 
+	/** This is soooo wrong, there must exsist a flag for
+	  * static plugins
+	Q_IMPORT_PLUGIN(QJpegPlugin);
+	  */
+#endif
+
+	MainWindow *mw = new MainWindow (NULL);
+
+	PlaylistWindow *playlistwin = new PlaylistWindow (mw);
+	EqualizerWindow *eqwin = new EqualizerWindow (mw);
+
+	/*
+	 * Now that everything is initialized
+	 * open the skin and send the
+	 * SkinChanged signal that will cause
+	 * all widgets to get their pixmaps
+	 */
+	if (!settings.contains ("skin/path")) {
+		settings.setValue ("skin/path", ":CleanAMP/");
+	}
+
+	Skin::getInstance()->setSkin (settings.value("skin/path").toString ());
+
+	mw->show ();
+	mw->setPL (playlistwin);
+	mw->setEQ (eqwin);
+
+	if (!settings.contains ("playlist/pos"))
+		settings.setValue ("playlist/pos", QPoint (mw->pos().x(),
+												   mw->pos().y()+mw->size().height()));
+	playlistwin->move (settings.value("playlist/pos").toPoint ());
+
+	if (!settings.contains ("playlist/hidden"))
+		settings.setValue ("playlist/hidden", true);
+
+	if (settings.value("playlist/hidden").toBool ())
+		playlistwin->hide ();
+	else
+		playlistwin->show ();
+
+
+	if (!settings.contains ("equalizer/pos"))
+		settings.setValue ("equalizer/pos", QPoint (mw->pos().x(),
+												   mw->pos().y()+mw->size().height()));
+	eqwin->move (settings.value("equalizer/pos").toPoint ());
+
+	if (!settings.contains ("equalizer/hidden"))
+		settings.setValue ("equalizer/hidden", true);
+
+	if (settings.value("equalizer/hidden").toBool ())
+		eqwin->hide ();
+	else
+		eqwin->show ();
+
+
+#ifdef HAVE_SERVERBROWSER
+	ServerBrowserWindow *browser = new ServerBrowserWindow (mw);
+	browser->show ();
+#endif
+
+	return app.exec();
+}
diff --git a/src/src.pri b/src/src.pri
index 2b99cb9..9f80586 100644
--- a/src/src.pri
+++ b/src/src.pri
@@ -25,7 +25,8 @@ HEADERS += PixWidget.h \
            BrowseModel.h \
            BrowseDialog.h
 
-SOURCES += PixWidget.cpp \
+SOURCES += main.cpp \
+		   PixWidget.cpp \
            Skin.cpp \
            MainWindow.cpp \
            Display.cpp \