diff --git a/pokerth.pro b/pokerth.pro
index 767bd3ef..e400d54b 100755
--- a/pokerth.pro
+++ b/pokerth.pro
@@ -15,9 +15,9 @@ HEADERS += mainwindowimpl.h \
            log.h \
            guiinterface.h \
            guiwrapper.h \
-           session.h \
+	   session.h \
            game.h \
-           localhand.h \
+	   localhand.h \
            localboard.h \
            localplayer.h \
            cardsvalue.h \
@@ -26,25 +26,26 @@ HEADERS += mainwindowimpl.h \
            localturn.h \
            localriver.h \
            tools.h \
-           handinterface.h \
+	   handinterface.h \
            playerinterface.h \
            boardinterface.h \
            preflopinterface.h \
            flopinterface.h \
            turninterface.h \
            riverinterface.h \
-           enginefactory.h \
-           localenginefactory.h 
+	   enginefactory.h \
+	   localenginefactory.h
+
 SOURCES += pokerth.cpp \
-           mainwindowimpl.cpp \
+	   mainwindowimpl.cpp \
            newgamedialogimpl.cpp \
            aboutpokerthimpl.cpp \
            log.cpp \
            guiinterface.cpp \
            guiwrapper.cpp \
-           session.cpp \
+	   session.cpp \
            game.cpp \
-           localhand.cpp \
+	   localhand.cpp \
            localboard.cpp \
            localplayer.cpp \
            cardsvalue.cpp \
@@ -53,19 +54,20 @@ SOURCES += pokerth.cpp \
            localturn.cpp \
            localriver.cpp \
            tools.cpp \
-           handinterface.cpp \
+	   handinterface.cpp \
            playerinterface.cpp \
            boardinterface.cpp \
            preflopinterface.cpp \
            flopinterface.cpp \
            turninterface.cpp \
            riverinterface.cpp \
-           enginefactory.cpp \
-           localenginefactory.cpp 
+	   enginefactory.cpp \
+	   localenginefactory.cpp
+
 RESOURCES = deck.qrc
 TEMPLATE = app
-DEPENDPATH += src uics src/gui src/engine_interfaces src/local_engine src/network_engine
-INCLUDEPATH += . src uics src/gui src/engine_interfaces src/local_engine src/network_engine
+DEPENDPATH += . src uics src/gui src/gui/qt src/engine src/engine/local_engine src/engine/network_engine
+INCLUDEPATH += . src uics src/gui src/gui/qt src/engine src/engine/local_engine src/engine/network_engine
 CONFIG += qt release
 UI_DIR = uics
 TARGET = bin/pokerth
diff --git a/enginefactory.cpp b/src/engine/enginefactory.cpp
similarity index 97%
rename from enginefactory.cpp
rename to src/engine/enginefactory.cpp
index 8f5bac83..49c3503b 100644
--- a/enginefactory.cpp
+++ b/src/engine/enginefactory.cpp
@@ -19,11 +19,6 @@
  ***************************************************************************/
 #include "enginefactory.h"
 
-EngineFactory::EngineFactory()
-{
-}
-
-
 EngineFactory::~EngineFactory()
 {
 }
diff --git a/enginefactory.h b/src/engine/enginefactory.h
similarity index 93%
rename from enginefactory.h
rename to src/engine/enginefactory.h
index 0323ad76..560384c1 100644
--- a/enginefactory.h
+++ b/src/engine/enginefactory.h
@@ -20,14 +20,10 @@
 #ifndef ENGINEFACTORY_H
 #define ENGINEFACTORY_H
 
-/**
-	@author FThauer FHammer <f.thauer@web.de>
-*/
 class EngineFactory{
 public:
-    EngineFactory();
-
-    ~EngineFactory();
+    
+	virtual ~EngineFactory();
 
 };
 
diff --git a/localenginefactory.cpp b/src/engine/local_engine/localenginefactory.cpp
similarity index 100%
rename from localenginefactory.cpp
rename to src/engine/local_engine/localenginefactory.cpp
diff --git a/localenginefactory.h b/src/engine/local_engine/localenginefactory.h
similarity index 100%
rename from localenginefactory.h
rename to src/engine/local_engine/localenginefactory.h