diff --git a/src/engine_interfaces/boardinterface.cpp b/src/engine/boardinterface.cpp
similarity index 100%
rename from src/engine_interfaces/boardinterface.cpp
rename to src/engine/boardinterface.cpp
diff --git a/src/engine_interfaces/boardinterface.h b/src/engine/boardinterface.h
similarity index 100%
rename from src/engine_interfaces/boardinterface.h
rename to src/engine/boardinterface.h
diff --git a/src/engine_interfaces/flopinterface.cpp b/src/engine/flopinterface.cpp
similarity index 100%
rename from src/engine_interfaces/flopinterface.cpp
rename to src/engine/flopinterface.cpp
diff --git a/src/engine_interfaces/flopinterface.h b/src/engine/flopinterface.h
similarity index 100%
rename from src/engine_interfaces/flopinterface.h
rename to src/engine/flopinterface.h
diff --git a/src/engine_interfaces/handinterface.cpp b/src/engine/handinterface.cpp
similarity index 100%
rename from src/engine_interfaces/handinterface.cpp
rename to src/engine/handinterface.cpp
diff --git a/src/engine_interfaces/handinterface.h b/src/engine/handinterface.h
similarity index 100%
rename from src/engine_interfaces/handinterface.h
rename to src/engine/handinterface.h
diff --git a/src/local_engine/cardsvalue.cpp b/src/engine/local_engine/cardsvalue.cpp
similarity index 100%
rename from src/local_engine/cardsvalue.cpp
rename to src/engine/local_engine/cardsvalue.cpp
diff --git a/src/local_engine/cardsvalue.h b/src/engine/local_engine/cardsvalue.h
similarity index 100%
rename from src/local_engine/cardsvalue.h
rename to src/engine/local_engine/cardsvalue.h
diff --git a/src/local_engine/localboard.cpp b/src/engine/local_engine/localboard.cpp
similarity index 100%
rename from src/local_engine/localboard.cpp
rename to src/engine/local_engine/localboard.cpp
diff --git a/src/local_engine/localboard.h b/src/engine/local_engine/localboard.h
similarity index 100%
rename from src/local_engine/localboard.h
rename to src/engine/local_engine/localboard.h
diff --git a/src/local_engine/localflop.cpp b/src/engine/local_engine/localflop.cpp
similarity index 100%
rename from src/local_engine/localflop.cpp
rename to src/engine/local_engine/localflop.cpp
diff --git a/src/local_engine/localflop.h b/src/engine/local_engine/localflop.h
similarity index 100%
rename from src/local_engine/localflop.h
rename to src/engine/local_engine/localflop.h
diff --git a/src/local_engine/localhand.cpp b/src/engine/local_engine/localhand.cpp
similarity index 100%
rename from src/local_engine/localhand.cpp
rename to src/engine/local_engine/localhand.cpp
diff --git a/src/local_engine/localhand.h b/src/engine/local_engine/localhand.h
similarity index 100%
rename from src/local_engine/localhand.h
rename to src/engine/local_engine/localhand.h
diff --git a/src/local_engine/localplayer.cpp b/src/engine/local_engine/localplayer.cpp
similarity index 100%
rename from src/local_engine/localplayer.cpp
rename to src/engine/local_engine/localplayer.cpp
diff --git a/src/local_engine/localplayer.h b/src/engine/local_engine/localplayer.h
similarity index 100%
rename from src/local_engine/localplayer.h
rename to src/engine/local_engine/localplayer.h
diff --git a/src/local_engine/localpreflop.cpp b/src/engine/local_engine/localpreflop.cpp
similarity index 100%
rename from src/local_engine/localpreflop.cpp
rename to src/engine/local_engine/localpreflop.cpp
diff --git a/src/local_engine/localpreflop.h b/src/engine/local_engine/localpreflop.h
similarity index 100%
rename from src/local_engine/localpreflop.h
rename to src/engine/local_engine/localpreflop.h
diff --git a/src/local_engine/localriver.cpp b/src/engine/local_engine/localriver.cpp
similarity index 100%
rename from src/local_engine/localriver.cpp
rename to src/engine/local_engine/localriver.cpp
diff --git a/src/local_engine/localriver.h b/src/engine/local_engine/localriver.h
similarity index 100%
rename from src/local_engine/localriver.h
rename to src/engine/local_engine/localriver.h
diff --git a/src/local_engine/localturn.cpp b/src/engine/local_engine/localturn.cpp
similarity index 100%
rename from src/local_engine/localturn.cpp
rename to src/engine/local_engine/localturn.cpp
diff --git a/src/local_engine/localturn.h b/src/engine/local_engine/localturn.h
similarity index 100%
rename from src/local_engine/localturn.h
rename to src/engine/local_engine/localturn.h
diff --git a/src/local_engine/tools.cpp b/src/engine/local_engine/tools.cpp
similarity index 100%
rename from src/local_engine/tools.cpp
rename to src/engine/local_engine/tools.cpp
diff --git a/src/local_engine/tools.h b/src/engine/local_engine/tools.h
similarity index 100%
rename from src/local_engine/tools.h
rename to src/engine/local_engine/tools.h
diff --git a/src/engine_interfaces/playerinterface.cpp b/src/engine/playerinterface.cpp
similarity index 100%
rename from src/engine_interfaces/playerinterface.cpp
rename to src/engine/playerinterface.cpp
diff --git a/src/engine_interfaces/playerinterface.h b/src/engine/playerinterface.h
similarity index 100%
rename from src/engine_interfaces/playerinterface.h
rename to src/engine/playerinterface.h
diff --git a/src/engine_interfaces/preflopinterface.cpp b/src/engine/preflopinterface.cpp
similarity index 100%
rename from src/engine_interfaces/preflopinterface.cpp
rename to src/engine/preflopinterface.cpp
diff --git a/src/engine_interfaces/preflopinterface.h b/src/engine/preflopinterface.h
similarity index 100%
rename from src/engine_interfaces/preflopinterface.h
rename to src/engine/preflopinterface.h
diff --git a/src/engine_interfaces/riverinterface.cpp b/src/engine/riverinterface.cpp
similarity index 100%
rename from src/engine_interfaces/riverinterface.cpp
rename to src/engine/riverinterface.cpp
diff --git a/src/engine_interfaces/riverinterface.h b/src/engine/riverinterface.h
similarity index 100%
rename from src/engine_interfaces/riverinterface.h
rename to src/engine/riverinterface.h
diff --git a/src/engine_interfaces/turninterface.cpp b/src/engine/turninterface.cpp
similarity index 100%
rename from src/engine_interfaces/turninterface.cpp
rename to src/engine/turninterface.cpp
diff --git a/src/engine_interfaces/turninterface.h b/src/engine/turninterface.h
similarity index 100%
rename from src/engine_interfaces/turninterface.h
rename to src/engine/turninterface.h
diff --git a/src/gui/aboutpokerth.ui b/src/gui/qt/aboutpokerth.ui
similarity index 100%
rename from src/gui/aboutpokerth.ui
rename to src/gui/qt/aboutpokerth.ui
diff --git a/src/gui/aboutpokerthimpl.cpp b/src/gui/qt/aboutpokerthimpl.cpp
similarity index 100%
rename from src/gui/aboutpokerthimpl.cpp
rename to src/gui/qt/aboutpokerthimpl.cpp
diff --git a/src/gui/aboutpokerthimpl.h b/src/gui/qt/aboutpokerthimpl.h
similarity index 100%
rename from src/gui/aboutpokerthimpl.h
rename to src/gui/qt/aboutpokerthimpl.h
diff --git a/src/gui/guiwrapper.cpp b/src/gui/qt/guiwrapper.cpp
similarity index 100%
rename from src/gui/guiwrapper.cpp
rename to src/gui/qt/guiwrapper.cpp
diff --git a/src/gui/guiwrapper.h b/src/gui/qt/guiwrapper.h
similarity index 100%
rename from src/gui/guiwrapper.h
rename to src/gui/qt/guiwrapper.h
diff --git a/src/gui/log.cpp b/src/gui/qt/log.cpp
similarity index 100%
rename from src/gui/log.cpp
rename to src/gui/qt/log.cpp
diff --git a/src/gui/log.h b/src/gui/qt/log.h
similarity index 100%
rename from src/gui/log.h
rename to src/gui/qt/log.h
diff --git a/src/gui/mainwindow-win.ui b/src/gui/qt/mainwindow-win.ui
similarity index 100%
rename from src/gui/mainwindow-win.ui
rename to src/gui/qt/mainwindow-win.ui
diff --git a/src/gui/mainwindow.ui b/src/gui/qt/mainwindow.ui
similarity index 100%
rename from src/gui/mainwindow.ui
rename to src/gui/qt/mainwindow.ui
diff --git a/src/gui/mainwindowimpl.cpp b/src/gui/qt/mainwindowimpl.cpp
similarity index 100%
rename from src/gui/mainwindowimpl.cpp
rename to src/gui/qt/mainwindowimpl.cpp
diff --git a/src/gui/mainwindowimpl.h b/src/gui/qt/mainwindowimpl.h
similarity index 100%
rename from src/gui/mainwindowimpl.h
rename to src/gui/qt/mainwindowimpl.h
diff --git a/src/gui/newgamedialog.ui b/src/gui/qt/newgamedialog.ui
similarity index 100%
rename from src/gui/newgamedialog.ui
rename to src/gui/qt/newgamedialog.ui
diff --git a/src/gui/newgamedialogimpl.cpp b/src/gui/qt/newgamedialogimpl.cpp
similarity index 100%
rename from src/gui/newgamedialogimpl.cpp
rename to src/gui/qt/newgamedialogimpl.cpp
diff --git a/src/gui/newgamedialogimpl.h b/src/gui/qt/newgamedialogimpl.h
similarity index 100%
rename from src/gui/newgamedialogimpl.h
rename to src/gui/qt/newgamedialogimpl.h