diff --git a/jpseditor.pro b/jpseditor.pro
index 31d06472630a494758dd640ee0becadd29502ec1..aad960dfffbc4b102a7f0f1c6fb026f25101d01b 100644
--- a/jpseditor.pro
+++ b/jpseditor.pro
@@ -1,144 +1,6 @@
- # This file is part of JuPedSim.
- #
- # JuPedSim is free software: you can redistribute it and/or modify
- # it under the terms of the GNU Lesser General Public License as published by
- # the Free Software Foundation, either version 3 of the License, or
- # any later version.
- #
- # JuPedSim 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.
- #
- # You should have received a copy of the GNU Lesser General Public License
- # along with JuPedSim. If not, see <http://www.gnu.org/licenses/>.
- #
- # copyright <2009-2018> Forschungszentrum Juelich GmbH.
+TEMPLATE = subdirs
- # Compatibility with Qt4 and Qt5
-greaterThan(QT_MAJOR_VERSION, 4):QT += widgets
+CONFIG+=ordered
-TEMPLATE = app
-TARGET = JPSeditor
-
-CONFIG += qt xml gui;
-CONFIG += c++11
-
-QMAKE_CXXFLAGS += -std=c++11
-QMAKE_CXXFLAGS += -static
-#QMAKE_CXXFLAGS += -static-libgcc
-#QMAKE_CXXFLAGS += -static-libstdc++
-
-#QMAKE_CXXFLAGS_WARN_ON = -Wall -Wno-unused-parameter
-
-
-
-FORMS += \
- forms/mainwindow.ui \
- forms/roomwidget.ui \
- forms/widgetlandmark.ui \
- forms/widgetsettings.ui \
- forms/inifilewidget.ui \
- forms/settingdialog.ui
-
-HEADERS += \
- src/mainWindow.h \
- src/GraphicView.h \
- src/roomwidget.h \
- src/rooms.h \
- src/datamanager.h \
- src/jpscrossing.h \
- src/jpsLineItem.h \
- src/jpsexit.h \
- src/jpsobstacle.h \
- src/jpslandmark.h \
- dxflib/src/dl_writer_ascii.h \
- dxflib/src/dl_writer.h \
- dxflib/src/dl_global.h \
- dxflib/src/dl_extrusion.h \
- dxflib/src/dl_exception.h \
- dxflib/src/dl_entities.h \
- dxflib/src/dl_dxf.h \
- dxflib/src/dl_creationinterface.h \
- dxflib/src/dl_creationadapter.h \
- dxflib/src/dl_codes.h \
- dxflib/src/dl_attributes.h \
- src/widgetlandmark.h \
- src/graphicscene.h \
- src/widgetsettings.h \
- src/jpsconnection.h \
- src/UndoFramework/actionstack.h \
- src/UndoFramework/action.h \
- src/UndoFramework/lineaction.h \
- src/jpsregion.h \
- src/AutomaticRoomIdentification/roomID.h\
- src/AutomaticRoomIdentification/roomdefinition.h \
- src/AutomaticRoomIdentification/roomidentification.h \
- src/dtrace.h \
- src/settingdialog.h \
- src/tinyxml/tinystr.h \
- src/tinyxml/tinyxml.h \
- src/inifilewidget.h \
-
-
-SOURCES += \
- src/mainWindow.cpp \
- src/main.cpp \
- src/GraphicView.cpp \
- src/roomwidget.cpp \
- src/rooms.cpp \
- src/datamanager.cpp \
- src/jpscrossing.cpp \
- src/jpsLineItem.cpp \
- src/jpsexit.cpp \
- src/jpsobstacle.cpp \
- src/jpslandmark.cpp \
- dxflib/src/dl_writer_ascii.cpp \
- dxflib/src/dl_dxf.cpp \
- src/widgetlandmark.cpp \
- src/graphicscene.cpp \
- src/widgetsettings.cpp \
- src/jpsconnection.cpp \
- src/UndoFramework/actionstack.cpp \
- src/UndoFramework/action.cpp \
- src/UndoFramework/lineaction.cpp \
- src/jpsregion.cpp \
- src/AutomaticRoomIdentification/roomdefinition.cpp \
- src/AutomaticRoomIdentification/roomidentification.cpp \
- src/settingdialog.cpp \
- src/tinyxml/tinystr.cpp \
- src/tinyxml/tinyxml.cpp \
- src/tinyxml/tinyxmlerror.cpp \
- src/tinyxml/tinyxmlparser.cpp \
- src/inifilewidget.cpp \
-
-
-#INCLUDEPATH += D:/boost_1_59_0/boost_1_59_0
-
-RESOURCES += \
- Resources/resources.qrc
-
-RC_FILE = Resources/jpseditor.rc
-#osx fix
-ICON = Resources/jpseditor.icns
-#INCLUDEPATH += $$(ROOTSYS)/include
-
-CONFIG(debug, debug|release) {
- DESTDIR = build/debug
-}
-CONFIG(release, debug|release) {
- DESTDIR = build/release
-}
-
-OBJECTS_DIR = $$DESTDIR/.obj
-MOC_DIR = $$DESTDIR/.moc
-RCC_DIR = $$DESTDIR/.qrc
-UI_DIR = $$DESTDIR/.u
-
-demos.path = /usr/local/bin/jpseditor
-demos.files = examples/*
-
-INSTALLS += demos
-
-target.path = /usr/local/bin/jpseditor
-INSTALLS += target
+SUBDIRS = \
+ src \
diff --git a/Resources/Icons/Delete.png b/src/Resources/Icons/Delete.png
similarity index 100%
rename from Resources/Icons/Delete.png
rename to src/Resources/Icons/Delete.png
diff --git a/Resources/Icons/DeleteAll.png b/src/Resources/Icons/DeleteAll.png
similarity index 100%
rename from Resources/Icons/DeleteAll.png
rename to src/Resources/Icons/DeleteAll.png
diff --git a/Resources/Icons/DeleteC.png b/src/Resources/Icons/DeleteC.png
similarity index 100%
rename from Resources/Icons/DeleteC.png
rename to src/Resources/Icons/DeleteC.png
diff --git a/Resources/Icons/Door.png b/src/Resources/Icons/Door.png
similarity index 100%
rename from Resources/Icons/Door.png
rename to src/Resources/Icons/Door.png
diff --git a/Resources/Icons/DoorC.png b/src/Resources/Icons/DoorC.png
similarity index 100%
rename from Resources/Icons/DoorC.png
rename to src/Resources/Icons/DoorC.png
diff --git a/Resources/Icons/Exit.png b/src/Resources/Icons/Exit.png
similarity index 100%
rename from Resources/Icons/Exit.png
rename to src/Resources/Icons/Exit.png
diff --git a/Resources/Icons/ExitC.png b/src/Resources/Icons/ExitC.png
similarity index 100%
rename from Resources/Icons/ExitC.png
rename to src/Resources/Icons/ExitC.png
diff --git a/Resources/Icons/GridC.png b/src/Resources/Icons/GridC.png
similarity index 100%
rename from Resources/Icons/GridC.png
rename to src/Resources/Icons/GridC.png
diff --git a/Resources/Icons/Pers1.png b/src/Resources/Icons/Pers1.png
similarity index 100%
rename from Resources/Icons/Pers1.png
rename to src/Resources/Icons/Pers1.png
diff --git a/Resources/Icons/Pers2.png b/src/Resources/Icons/Pers2.png
similarity index 100%
rename from Resources/Icons/Pers2.png
rename to src/Resources/Icons/Pers2.png
diff --git a/Resources/Icons/Pers3.png b/src/Resources/Icons/Pers3.png
similarity index 100%
rename from Resources/Icons/Pers3.png
rename to src/Resources/Icons/Pers3.png
diff --git a/Resources/Icons/Pers4.png b/src/Resources/Icons/Pers4.png
similarity index 100%
rename from Resources/Icons/Pers4.png
rename to src/Resources/Icons/Pers4.png
diff --git a/Resources/Icons/Pers5.png b/src/Resources/Icons/Pers5.png
similarity index 100%
rename from Resources/Icons/Pers5.png
rename to src/Resources/Icons/Pers5.png
diff --git a/Resources/Icons/Pers6.png b/src/Resources/Icons/Pers6.png
similarity index 100%
rename from Resources/Icons/Pers6.png
rename to src/Resources/Icons/Pers6.png
diff --git a/Resources/Icons/Pers7.png b/src/Resources/Icons/Pers7.png
similarity index 100%
rename from Resources/Icons/Pers7.png
rename to src/Resources/Icons/Pers7.png
diff --git a/Resources/Icons/Pers8.png b/src/Resources/Icons/Pers8.png
similarity index 100%
rename from Resources/Icons/Pers8.png
rename to src/Resources/Icons/Pers8.png
diff --git a/Resources/Icons/Person.png b/src/Resources/Icons/Person.png
similarity index 100%
rename from Resources/Icons/Person.png
rename to src/Resources/Icons/Person.png
diff --git a/Resources/Icons/PersonC.png b/src/Resources/Icons/PersonC.png
similarity index 100%
rename from Resources/Icons/PersonC.png
rename to src/Resources/Icons/PersonC.png
diff --git a/Resources/Icons/Redo-Icon.png b/src/Resources/Icons/Redo-Icon.png
similarity index 100%
rename from Resources/Icons/Redo-Icon.png
rename to src/Resources/Icons/Redo-Icon.png
diff --git a/Resources/Icons/Room.png b/src/Resources/Icons/Room.png
similarity index 100%
rename from Resources/Icons/Room.png
rename to src/Resources/Icons/Room.png
diff --git a/Resources/Icons/Step.png b/src/Resources/Icons/Step.png
similarity index 100%
rename from Resources/Icons/Step.png
rename to src/Resources/Icons/Step.png
diff --git a/Resources/Icons/StepC.png b/src/Resources/Icons/StepC.png
similarity index 100%
rename from Resources/Icons/StepC.png
rename to src/Resources/Icons/StepC.png
diff --git a/Resources/Icons/Trans.png b/src/Resources/Icons/Trans.png
similarity index 100%
rename from Resources/Icons/Trans.png
rename to src/Resources/Icons/Trans.png
diff --git a/Resources/Icons/TransC.png b/src/Resources/Icons/TransC.png
similarity index 100%
rename from Resources/Icons/TransC.png
rename to src/Resources/Icons/TransC.png
diff --git a/Resources/Icons/Undo-icon.png b/src/Resources/Icons/Undo-icon.png
similarity index 100%
rename from Resources/Icons/Undo-icon.png
rename to src/Resources/Icons/Undo-icon.png
diff --git a/Resources/Icons/Wall.png b/src/Resources/Icons/Wall.png
similarity index 100%
rename from Resources/Icons/Wall.png
rename to src/Resources/Icons/Wall.png
diff --git a/Resources/Icons/WallC.png b/src/Resources/Icons/WallC.png
similarity index 100%
rename from Resources/Icons/WallC.png
rename to src/Resources/Icons/WallC.png
diff --git a/Resources/Icons/anglesnap.png b/src/Resources/Icons/anglesnap.png
similarity index 100%
rename from Resources/Icons/anglesnap.png
rename to src/Resources/Icons/anglesnap.png
diff --git a/Resources/Icons/autoRoom.png b/src/Resources/Icons/autoRoom.png
similarity index 100%
rename from Resources/Icons/autoRoom.png
rename to src/Resources/Icons/autoRoom.png
diff --git a/Resources/Icons/basicCursor.png b/src/Resources/Icons/basicCursor.png
similarity index 100%
rename from Resources/Icons/basicCursor.png
rename to src/Resources/Icons/basicCursor.png
diff --git a/Resources/Icons/door-open.svg b/src/Resources/Icons/door-open.svg
similarity index 100%
rename from Resources/Icons/door-open.svg
rename to src/Resources/Icons/door-open.svg
diff --git a/Resources/Icons/eraser.svg b/src/Resources/Icons/eraser.svg
similarity index 100%
rename from Resources/Icons/eraser.svg
rename to src/Resources/Icons/eraser.svg
diff --git a/Resources/Icons/file-import.svg b/src/Resources/Icons/file-import.svg
similarity index 100%
rename from Resources/Icons/file-import.svg
rename to src/Resources/Icons/file-import.svg
diff --git a/Resources/Icons/filesave.png b/src/Resources/Icons/filesave.png
similarity index 100%
rename from Resources/Icons/filesave.png
rename to src/Resources/Icons/filesave.png
diff --git a/Resources/Icons/filesaveas.png b/src/Resources/Icons/filesaveas.png
similarity index 100%
rename from Resources/Icons/filesaveas.png
rename to src/Resources/Icons/filesaveas.png
diff --git a/Resources/Icons/flag.svg b/src/Resources/Icons/flag.svg
similarity index 100%
rename from Resources/Icons/flag.svg
rename to src/Resources/Icons/flag.svg
diff --git a/Resources/Icons/folder-open.svg b/src/Resources/Icons/folder-open.svg
similarity index 100%
rename from Resources/Icons/folder-open.svg
rename to src/Resources/Icons/folder-open.svg
diff --git a/Resources/Icons/grid.png b/src/Resources/Icons/grid.png
similarity index 100%
rename from Resources/Icons/grid.png
rename to src/Resources/Icons/grid.png
diff --git a/Resources/Icons/hand-pointer.svg b/src/Resources/Icons/hand-pointer.svg
similarity index 100%
rename from Resources/Icons/hand-pointer.svg
rename to src/Resources/Icons/hand-pointer.svg
diff --git a/Resources/Icons/hline.png b/src/Resources/Icons/hline.png
similarity index 100%
rename from Resources/Icons/hline.png
rename to src/Resources/Icons/hline.png
diff --git a/Resources/Icons/jupedsim.png b/src/Resources/Icons/jupedsim.png
similarity index 100%
rename from Resources/Icons/jupedsim.png
rename to src/Resources/Icons/jupedsim.png
diff --git a/Resources/Icons/landmark.svg b/src/Resources/Icons/landmark.svg
similarity index 100%
rename from Resources/Icons/landmark.svg
rename to src/Resources/Icons/landmark.svg
diff --git a/Resources/Icons/man-gimp1.png b/src/Resources/Icons/man-gimp1.png
similarity index 100%
rename from Resources/Icons/man-gimp1.png
rename to src/Resources/Icons/man-gimp1.png
diff --git a/Resources/Icons/minus-square.svg b/src/Resources/Icons/minus-square.svg
similarity index 100%
rename from Resources/Icons/minus-square.svg
rename to src/Resources/Icons/minus-square.svg
diff --git a/Resources/Icons/moved_hand.svg b/src/Resources/Icons/moved_hand.svg
similarity index 100%
rename from Resources/Icons/moved_hand.svg
rename to src/Resources/Icons/moved_hand.svg
diff --git a/Resources/Icons/new.png b/src/Resources/Icons/new.png
similarity index 100%
rename from Resources/Icons/new.png
rename to src/Resources/Icons/new.png
diff --git a/Resources/Icons/open.png b/src/Resources/Icons/open.png
similarity index 100%
rename from Resources/Icons/open.png
rename to src/Resources/Icons/open.png
diff --git a/Resources/Icons/plus.svg b/src/Resources/Icons/plus.svg
similarity index 100%
rename from Resources/Icons/plus.svg
rename to src/Resources/Icons/plus.svg
diff --git a/Resources/Icons/redo.svg b/src/Resources/Icons/redo.svg
similarity index 100%
rename from Resources/Icons/redo.svg
rename to src/Resources/Icons/redo.svg
diff --git a/Resources/Icons/rooms.png b/src/Resources/Icons/rooms.png
similarity index 100%
rename from Resources/Icons/rooms.png
rename to src/Resources/Icons/rooms.png
diff --git a/Resources/Icons/rotate.png b/src/Resources/Icons/rotate.png
similarity index 100%
rename from Resources/Icons/rotate.png
rename to src/Resources/Icons/rotate.png
diff --git a/Resources/Icons/save.svg b/src/Resources/Icons/save.svg
similarity index 100%
rename from Resources/Icons/save.svg
rename to src/Resources/Icons/save.svg
diff --git a/Resources/Icons/snap.png b/src/Resources/Icons/snap.png
similarity index 100%
rename from Resources/Icons/snap.png
rename to src/Resources/Icons/snap.png
diff --git a/Resources/Icons/snaping.png b/src/Resources/Icons/snaping.png
similarity index 100%
rename from Resources/Icons/snaping.png
rename to src/Resources/Icons/snaping.png
diff --git a/Resources/Icons/statue.jpg b/src/Resources/Icons/statue.jpg
similarity index 100%
rename from Resources/Icons/statue.jpg
rename to src/Resources/Icons/statue.jpg
diff --git a/Resources/Icons/statue_specs.jpg b/src/Resources/Icons/statue_specs.jpg
similarity index 100%
rename from Resources/Icons/statue_specs.jpg
rename to src/Resources/Icons/statue_specs.jpg
diff --git a/Resources/Icons/trash-alt.svg b/src/Resources/Icons/trash-alt.svg
similarity index 100%
rename from Resources/Icons/trash-alt.svg
rename to src/Resources/Icons/trash-alt.svg
diff --git a/Resources/Icons/undo.svg b/src/Resources/Icons/undo.svg
similarity index 100%
rename from Resources/Icons/undo.svg
rename to src/Resources/Icons/undo.svg
diff --git a/Resources/Icons/wall.svg b/src/Resources/Icons/wall.svg
similarity index 100%
rename from Resources/Icons/wall.svg
rename to src/Resources/Icons/wall.svg
diff --git a/Resources/Icons/zoom_in.png b/src/Resources/Icons/zoom_in.png
similarity index 100%
rename from Resources/Icons/zoom_in.png
rename to src/Resources/Icons/zoom_in.png
diff --git a/Resources/Icons/zoom_out.png b/src/Resources/Icons/zoom_out.png
similarity index 100%
rename from Resources/Icons/zoom_out.png
rename to src/Resources/Icons/zoom_out.png
diff --git a/Resources/Info.plist.in b/src/Resources/Info.plist.in
similarity index 100%
rename from Resources/Info.plist.in
rename to src/Resources/Info.plist.in
diff --git a/Resources/jpseditor.icns b/src/Resources/jpseditor.icns
similarity index 100%
rename from Resources/jpseditor.icns
rename to src/Resources/jpseditor.icns
diff --git a/Resources/jpseditor.ico b/src/Resources/jpseditor.ico
similarity index 100%
rename from Resources/jpseditor.ico
rename to src/Resources/jpseditor.ico
diff --git a/Resources/jpseditor.rc b/src/Resources/jpseditor.rc
similarity index 100%
rename from Resources/jpseditor.rc
rename to src/Resources/jpseditor.rc
diff --git a/Resources/resources.qrc b/src/Resources/resources.qrc
similarity index 100%
rename from Resources/resources.qrc
rename to src/Resources/resources.qrc
diff --git a/src/datamanager.h b/src/datamanager.h
index 5cd951032a49e8fb60a6d29622d6e835c033f4c4..abe02c4aeb9ea60a4008de4c26520e96ae253a9a 100644
--- a/src/datamanager.h
+++ b/src/datamanager.h
@@ -44,8 +44,8 @@
#include "jpsregion.h"
#include <random>
-#include "../dxflib/src/dl_creationadapter.h"
-#include "../dxflib/src/dl_dxf.h"
+#include "dxflib/src/dl_creationadapter.h"
+#include "dxflib/src/dl_dxf.h"
using ptrConnection = std::shared_ptr<jpsConnection>;
diff --git a/dxflib/dxflib.doxygen b/src/dxflib/dxflib.doxygen
similarity index 100%
rename from dxflib/dxflib.doxygen
rename to src/dxflib/dxflib.doxygen
diff --git a/dxflib/dxflib.pro b/src/dxflib/dxflib.pro
similarity index 100%
rename from dxflib/dxflib.pro
rename to src/dxflib/dxflib.pro
diff --git a/dxflib/dxflib_commercial_license.txt b/src/dxflib/dxflib_commercial_license.txt
similarity index 100%
rename from dxflib/dxflib_commercial_license.txt
rename to src/dxflib/dxflib_commercial_license.txt
diff --git a/dxflib/gpl-2.0greater.txt b/src/dxflib/gpl-2.0greater.txt
similarity index 100%
rename from dxflib/gpl-2.0greater.txt
rename to src/dxflib/gpl-2.0greater.txt
diff --git a/dxflib/src/dl_attributes.h b/src/dxflib/src/dl_attributes.h
similarity index 100%
rename from dxflib/src/dl_attributes.h
rename to src/dxflib/src/dl_attributes.h
diff --git a/dxflib/src/dl_codes.h b/src/dxflib/src/dl_codes.h
similarity index 100%
rename from dxflib/src/dl_codes.h
rename to src/dxflib/src/dl_codes.h
diff --git a/dxflib/src/dl_creationadapter.h b/src/dxflib/src/dl_creationadapter.h
similarity index 100%
rename from dxflib/src/dl_creationadapter.h
rename to src/dxflib/src/dl_creationadapter.h
diff --git a/dxflib/src/dl_creationinterface.h b/src/dxflib/src/dl_creationinterface.h
similarity index 100%
rename from dxflib/src/dl_creationinterface.h
rename to src/dxflib/src/dl_creationinterface.h
diff --git a/dxflib/src/dl_dxf.cpp b/src/dxflib/src/dl_dxf.cpp
similarity index 100%
rename from dxflib/src/dl_dxf.cpp
rename to src/dxflib/src/dl_dxf.cpp
diff --git a/dxflib/src/dl_dxf.h b/src/dxflib/src/dl_dxf.h
similarity index 100%
rename from dxflib/src/dl_dxf.h
rename to src/dxflib/src/dl_dxf.h
diff --git a/dxflib/src/dl_entities.h b/src/dxflib/src/dl_entities.h
similarity index 100%
rename from dxflib/src/dl_entities.h
rename to src/dxflib/src/dl_entities.h
diff --git a/dxflib/src/dl_exception.h b/src/dxflib/src/dl_exception.h
similarity index 100%
rename from dxflib/src/dl_exception.h
rename to src/dxflib/src/dl_exception.h
diff --git a/dxflib/src/dl_extrusion.h b/src/dxflib/src/dl_extrusion.h
similarity index 100%
rename from dxflib/src/dl_extrusion.h
rename to src/dxflib/src/dl_extrusion.h
diff --git a/dxflib/src/dl_global.h b/src/dxflib/src/dl_global.h
similarity index 100%
rename from dxflib/src/dl_global.h
rename to src/dxflib/src/dl_global.h
diff --git a/dxflib/src/dl_writer.h b/src/dxflib/src/dl_writer.h
similarity index 100%
rename from dxflib/src/dl_writer.h
rename to src/dxflib/src/dl_writer.h
diff --git a/dxflib/src/dl_writer_ascii.cpp b/src/dxflib/src/dl_writer_ascii.cpp
similarity index 100%
rename from dxflib/src/dl_writer_ascii.cpp
rename to src/dxflib/src/dl_writer_ascii.cpp
diff --git a/dxflib/src/dl_writer_ascii.h b/src/dxflib/src/dl_writer_ascii.h
similarity index 100%
rename from dxflib/src/dl_writer_ascii.h
rename to src/dxflib/src/dl_writer_ascii.h
diff --git a/dxflib/test/3dface.dxf b/src/dxflib/test/3dface.dxf
similarity index 100%
rename from dxflib/test/3dface.dxf
rename to src/dxflib/test/3dface.dxf
diff --git a/dxflib/test/demo - Kopie.dxf b/src/dxflib/test/demo - Kopie.dxf
similarity index 100%
rename from dxflib/test/demo - Kopie.dxf
rename to src/dxflib/test/demo - Kopie.dxf
diff --git a/dxflib/test/demo.dxf b/src/dxflib/test/demo.dxf
similarity index 100%
rename from dxflib/test/demo.dxf
rename to src/dxflib/test/demo.dxf
diff --git a/dxflib/test/main.cpp b/src/dxflib/test/main.cpp
similarity index 100%
rename from dxflib/test/main.cpp
rename to src/dxflib/test/main.cpp
diff --git a/dxflib/test/myfile.dxf b/src/dxflib/test/myfile.dxf
similarity index 100%
rename from dxflib/test/myfile.dxf
rename to src/dxflib/test/myfile.dxf
diff --git a/dxflib/test/test.pro b/src/dxflib/test/test.pro
similarity index 100%
rename from dxflib/test/test.pro
rename to src/dxflib/test/test.pro
diff --git a/dxflib/test/test.sh b/src/dxflib/test/test.sh
similarity index 100%
rename from dxflib/test/test.sh
rename to src/dxflib/test/test.sh
diff --git a/dxflib/test/test_creationclass.cpp b/src/dxflib/test/test_creationclass.cpp
similarity index 100%
rename from dxflib/test/test_creationclass.cpp
rename to src/dxflib/test/test_creationclass.cpp
diff --git a/dxflib/test/test_creationclass.h b/src/dxflib/test/test_creationclass.h
similarity index 100%
rename from dxflib/test/test_creationclass.h
rename to src/dxflib/test/test_creationclass.h
diff --git a/forms/inifilewidget.ui b/src/forms/inifilewidget.ui
similarity index 100%
rename from forms/inifilewidget.ui
rename to src/forms/inifilewidget.ui
diff --git a/forms/mainwindow.ui b/src/forms/mainwindow.ui
similarity index 100%
rename from forms/mainwindow.ui
rename to src/forms/mainwindow.ui
diff --git a/forms/roomwidget.ui b/src/forms/roomwidget.ui
similarity index 100%
rename from forms/roomwidget.ui
rename to src/forms/roomwidget.ui
diff --git a/forms/settingdialog.ui b/src/forms/settingdialog.ui
similarity index 100%
rename from forms/settingdialog.ui
rename to src/forms/settingdialog.ui
diff --git a/forms/widgetlandmark.ui b/src/forms/widgetlandmark.ui
similarity index 100%
rename from forms/widgetlandmark.ui
rename to src/forms/widgetlandmark.ui
diff --git a/forms/widgetsettings.ui b/src/forms/widgetsettings.ui
similarity index 100%
rename from forms/widgetsettings.ui
rename to src/forms/widgetsettings.ui
diff --git a/src/mainWindow.h b/src/mainWindow.h
index 98f3f406c9521feb19f8e311f071d7a0fe7bafae..9becbbbefcd2c3fe5eab792e31f82d2782f681e9 100644
--- a/src/mainWindow.h
+++ b/src/mainWindow.h
@@ -41,7 +41,7 @@
#include "GraphicView.h"
#include "datamanager.h"
#include "rooms.h"
-#include "src/settingdialog.h"
+#include "settingdialog.h"
#include "inifilewidget.h"
diff --git a/src/src.pro b/src/src.pro
new file mode 100644
index 0000000000000000000000000000000000000000..b897c21351c7099b4c8f93a5d791e48e96a79f41
--- /dev/null
+++ b/src/src.pro
@@ -0,0 +1,144 @@
+ # This file is part of JuPedSim.
+ #
+ # JuPedSim is free software: you can redistribute it and/or modify
+ # it under the terms of the GNU Lesser General Public License as published by
+ # the Free Software Foundation, either version 3 of the License, or
+ # any later version.
+ #
+ # JuPedSim 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.
+ #
+ # You should have received a copy of the GNU Lesser General Public License
+ # along with JuPedSim. If not, see <http://www.gnu.org/licenses/>.
+ #
+ # copyright <2009-2018> Forschungszentrum Juelich GmbH.
+
+ # Compatibility with Qt4 and Qt5
+greaterThan(QT_MAJOR_VERSION, 4):QT += widgets
+
+TEMPLATE = app
+TARGET = JPSeditor
+
+CONFIG += qt xml gui;
+CONFIG += c++11
+
+QMAKE_CXXFLAGS += -std=c++11
+QMAKE_CXXFLAGS += -static
+#QMAKE_CXXFLAGS += -static-libgcc
+#QMAKE_CXXFLAGS += -static-libstdc++
+
+#QMAKE_CXXFLAGS_WARN_ON = -Wall -Wno-unused-parameter
+
+
+
+FORMS += \
+ forms/mainwindow.ui \
+ forms/roomwidget.ui \
+ forms/widgetlandmark.ui \
+ forms/widgetsettings.ui \
+ forms/inifilewidget.ui \
+ forms/settingdialog.ui
+
+HEADERS += \
+ mainWindow.h \
+ GraphicView.h \
+ roomwidget.h \
+ rooms.h \
+ datamanager.h \
+ jpscrossing.h \
+ jpsLineItem.h \
+ jpsexit.h \
+ jpsobstacle.h \
+ jpslandmark.h \
+ dxflib/src/dl_writer_ascii.h \
+ dxflib/src/dl_writer.h \
+ dxflib/src/dl_global.h \
+ dxflib/src/dl_extrusion.h \
+ dxflib/src/dl_exception.h \
+ dxflib/src/dl_entities.h \
+ dxflib/src/dl_dxf.h \
+ dxflib/src/dl_creationinterface.h \
+ dxflib/src/dl_creationadapter.h \
+ dxflib/src/dl_codes.h \
+ dxflib/src/dl_attributes.h \
+ widgetlandmark.h \
+ graphicscene.h \
+ widgetsettings.h \
+ jpsconnection.h \
+ UndoFramework/actionstack.h \
+ UndoFramework/action.h \
+ UndoFramework/lineaction.h \
+ jpsregion.h \
+ AutomaticRoomIdentification/roomID.h\
+ AutomaticRoomIdentification/roomdefinition.h \
+ AutomaticRoomIdentification/roomidentification.h \
+ dtrace.h \
+ settingdialog.h \
+ tinyxml/tinystr.h \
+ tinyxml/tinyxml.h \
+ inifilewidget.h \
+
+
+SOURCES += \
+ mainWindow.cpp \
+ main.cpp \
+ GraphicView.cpp \
+ roomwidget.cpp \
+ rooms.cpp \
+ datamanager.cpp \
+ jpscrossing.cpp \
+ jpsLineItem.cpp \
+ jpsexit.cpp \
+ jpsobstacle.cpp \
+ jpslandmark.cpp \
+ dxflib/src/dl_writer_ascii.cpp \
+ dxflib/src/dl_dxf.cpp \
+ widgetlandmark.cpp \
+ graphicscene.cpp \
+ widgetsettings.cpp \
+ jpsconnection.cpp \
+ UndoFramework/actionstack.cpp \
+ UndoFramework/action.cpp \
+ UndoFramework/lineaction.cpp \
+ jpsregion.cpp \
+ AutomaticRoomIdentification/roomdefinition.cpp \
+ AutomaticRoomIdentification/roomidentification.cpp \
+ settingdialog.cpp \
+ tinyxml/tinystr.cpp \
+ tinyxml/tinyxml.cpp \
+ tinyxml/tinyxmlerror.cpp \
+ tinyxml/tinyxmlparser.cpp \
+ inifilewidget.cpp \
+
+
+#INCLUDEPATH += D:/boost_1_59_0/boost_1_59_0
+
+RESOURCES += \
+ Resources/resources.qrc
+
+RC_FILE = Resources/jpseditor.rc
+#osx fix
+ICON = Resources/jpseditor.icns
+#INCLUDEPATH += $$(ROOTSYS)/include
+
+#CONFIG(debug, debug|release) {
+# DESTDIR = build/debug
+#}
+#CONFIG(release, debug|release) {
+# DESTDIR = build/release
+#}
+
+#OBJECTS_DIR = $$DESTDIR/.obj
+#MOC_DIR = $$DESTDIR/.moc
+#RCC_DIR = $$DESTDIR/.qrc
+#UI_DIR = $$DESTDIR/.u
+
+#demos.path = /usr/local/bin/jpseditor
+#demos.files = examples/*
+
+#INSTALLS += demos
+
+#target.path = /usr/local/bin/jpseditor
+#INSTALLS += target