Index: src/UIElements/CommandLineUI/Query/AtomCommandLineQuery.cpp
===================================================================
--- src/UIElements/CommandLineUI/Query/AtomCommandLineQuery.cpp	(revision 8df74dbef13fb1628a8f98eeaac6b7c477e95818)
+++ src/UIElements/CommandLineUI/Query/AtomCommandLineQuery.cpp	(revision e4afb4b989433224538ab4ba0f471e4573bbeaf2)
@@ -26,5 +26,5 @@
 #include "CommandLineUI/CommandLineDialog.hpp"
 
-#include "CommandLineParser.hpp"
+#include "CommandLineUI/CommandLineParser.hpp"
 #include "Helpers/Log.hpp"
 #include "Helpers/Verbose.hpp"
Index: src/UIElements/CommandLineUI/Query/AtomsCommandLineQuery.cpp
===================================================================
--- src/UIElements/CommandLineUI/Query/AtomsCommandLineQuery.cpp	(revision 8df74dbef13fb1628a8f98eeaac6b7c477e95818)
+++ src/UIElements/CommandLineUI/Query/AtomsCommandLineQuery.cpp	(revision e4afb4b989433224538ab4ba0f471e4573bbeaf2)
@@ -24,7 +24,7 @@
 #include "CommandLineUI/CommandLineDialog.hpp"
 
+#include "CommandLineUI/CommandLineParser.hpp"
 #include "Helpers/Log.hpp"
 #include "Helpers/Verbose.hpp"
-#include "CommandLineParser.hpp"
 #include "World.hpp"
 
Index: src/UIElements/CommandLineUI/Query/BooleanCommandLineQuery.cpp
===================================================================
--- src/UIElements/CommandLineUI/Query/BooleanCommandLineQuery.cpp	(revision 8df74dbef13fb1628a8f98eeaac6b7c477e95818)
+++ src/UIElements/CommandLineUI/Query/BooleanCommandLineQuery.cpp	(revision e4afb4b989433224538ab4ba0f471e4573bbeaf2)
@@ -22,7 +22,7 @@
 #include "CommandLineUI/CommandLineDialog.hpp"
 
+#include "CommandLineUI/CommandLineParser.hpp"
 #include "Helpers/Log.hpp"
 #include "Helpers/Verbose.hpp"
-#include "CommandLineParser.hpp"
 
 CommandLineDialog::BooleanCommandLineQuery::BooleanCommandLineQuery(string title, string _description) :
Index: src/UIElements/CommandLineUI/Query/BoxCommandLineQuery.cpp
===================================================================
--- src/UIElements/CommandLineUI/Query/BoxCommandLineQuery.cpp	(revision 8df74dbef13fb1628a8f98eeaac6b7c477e95818)
+++ src/UIElements/CommandLineUI/Query/BoxCommandLineQuery.cpp	(revision e4afb4b989433224538ab4ba0f471e4573bbeaf2)
@@ -23,8 +23,8 @@
 
 #include "Actions/Values.hpp"
+#include "CommandLineUI/CommandLineParser.hpp"
 #include "Helpers/Log.hpp"
 #include "Helpers/Verbose.hpp"
 #include "LinearAlgebra/Matrix.hpp"
-#include "CommandLineParser.hpp"
 
 CommandLineDialog::BoxCommandLineQuery::BoxCommandLineQuery(string title, string _description) :
Index: src/UIElements/CommandLineUI/Query/DoubleCommandLineQuery.cpp
===================================================================
--- src/UIElements/CommandLineUI/Query/DoubleCommandLineQuery.cpp	(revision 8df74dbef13fb1628a8f98eeaac6b7c477e95818)
+++ src/UIElements/CommandLineUI/Query/DoubleCommandLineQuery.cpp	(revision e4afb4b989433224538ab4ba0f471e4573bbeaf2)
@@ -22,7 +22,7 @@
 #include "CommandLineUI/CommandLineDialog.hpp"
 
+#include "CommandLineUI/CommandLineParser.hpp"
 #include "Helpers/Log.hpp"
 #include "Helpers/Verbose.hpp"
-#include "CommandLineParser.hpp"
 
 
Index: src/UIElements/CommandLineUI/Query/DoublesCommandLineQuery.cpp
===================================================================
--- src/UIElements/CommandLineUI/Query/DoublesCommandLineQuery.cpp	(revision 8df74dbef13fb1628a8f98eeaac6b7c477e95818)
+++ src/UIElements/CommandLineUI/Query/DoublesCommandLineQuery.cpp	(revision e4afb4b989433224538ab4ba0f471e4573bbeaf2)
@@ -22,7 +22,7 @@
 #include "CommandLineUI/CommandLineDialog.hpp"
 
+#include "CommandLineUI/CommandLineParser.hpp"
 #include "Helpers/Log.hpp"
 #include "Helpers/Verbose.hpp"
-#include "CommandLineParser.hpp"
 
 CommandLineDialog::DoublesCommandLineQuery::DoublesCommandLineQuery(string title, string _description) :
Index: src/UIElements/CommandLineUI/Query/ElementCommandLineQuery.cpp
===================================================================
--- src/UIElements/CommandLineUI/Query/ElementCommandLineQuery.cpp	(revision 8df74dbef13fb1628a8f98eeaac6b7c477e95818)
+++ src/UIElements/CommandLineUI/Query/ElementCommandLineQuery.cpp	(revision e4afb4b989433224538ab4ba0f471e4573bbeaf2)
@@ -22,7 +22,7 @@
 #include "CommandLineUI/CommandLineDialog.hpp"
 
+#include "CommandLineUI/CommandLineParser.hpp"
 #include "Helpers/Log.hpp"
 #include "Helpers/Verbose.hpp"
-#include "CommandLineParser.hpp"
 #include "element.hpp"
 #include "periodentafel.hpp"
Index: src/UIElements/CommandLineUI/Query/ElementsCommandLineQuery.cpp
===================================================================
--- src/UIElements/CommandLineUI/Query/ElementsCommandLineQuery.cpp	(revision 8df74dbef13fb1628a8f98eeaac6b7c477e95818)
+++ src/UIElements/CommandLineUI/Query/ElementsCommandLineQuery.cpp	(revision e4afb4b989433224538ab4ba0f471e4573bbeaf2)
@@ -22,7 +22,7 @@
 #include "CommandLineUI/CommandLineDialog.hpp"
 
+#include "CommandLineUI/CommandLineParser.hpp"
 #include "Helpers/Log.hpp"
 #include "Helpers/Verbose.hpp"
-#include "CommandLineParser.hpp"
 #include "element.hpp"
 #include "periodentafel.hpp"
Index: src/UIElements/CommandLineUI/Query/EmptyCommandLineQuery.cpp
===================================================================
--- src/UIElements/CommandLineUI/Query/EmptyCommandLineQuery.cpp	(revision 8df74dbef13fb1628a8f98eeaac6b7c477e95818)
+++ src/UIElements/CommandLineUI/Query/EmptyCommandLineQuery.cpp	(revision e4afb4b989433224538ab4ba0f471e4573bbeaf2)
@@ -24,7 +24,7 @@
 #include "CommandLineUI/CommandLineDialog.hpp"
 
+#include "CommandLineUI/CommandLineParser.hpp"
 #include "Helpers/Log.hpp"
 #include "Helpers/Verbose.hpp"
-#include "CommandLineParser.hpp"
 
 CommandLineDialog::EmptyCommandLineQuery::EmptyCommandLineQuery(string title, string _description) :
Index: src/UIElements/CommandLineUI/Query/FileCommandLineQuery.cpp
===================================================================
--- src/UIElements/CommandLineUI/Query/FileCommandLineQuery.cpp	(revision 8df74dbef13fb1628a8f98eeaac6b7c477e95818)
+++ src/UIElements/CommandLineUI/Query/FileCommandLineQuery.cpp	(revision e4afb4b989433224538ab4ba0f471e4573bbeaf2)
@@ -22,7 +22,7 @@
 #include "CommandLineUI/CommandLineDialog.hpp"
 
+#include "CommandLineUI/CommandLineParser.hpp"
 #include "Helpers/Log.hpp"
 #include "Helpers/Verbose.hpp"
-#include "CommandLineParser.hpp"
 
 CommandLineDialog::FileCommandLineQuery::FileCommandLineQuery(string title, string _description) :
Index: src/UIElements/CommandLineUI/Query/IntCommandLineQuery.cpp
===================================================================
--- src/UIElements/CommandLineUI/Query/IntCommandLineQuery.cpp	(revision 8df74dbef13fb1628a8f98eeaac6b7c477e95818)
+++ src/UIElements/CommandLineUI/Query/IntCommandLineQuery.cpp	(revision e4afb4b989433224538ab4ba0f471e4573bbeaf2)
@@ -22,7 +22,7 @@
 #include "CommandLineUI/CommandLineDialog.hpp"
 
+#include "CommandLineUI/CommandLineParser.hpp"
 #include "Helpers/Log.hpp"
 #include "Helpers/Verbose.hpp"
-#include "CommandLineParser.hpp"
 
 CommandLineDialog::IntCommandLineQuery::IntCommandLineQuery(string title, string _description) :
Index: src/UIElements/CommandLineUI/Query/IntsCommandLineQuery.cpp
===================================================================
--- src/UIElements/CommandLineUI/Query/IntsCommandLineQuery.cpp	(revision 8df74dbef13fb1628a8f98eeaac6b7c477e95818)
+++ src/UIElements/CommandLineUI/Query/IntsCommandLineQuery.cpp	(revision e4afb4b989433224538ab4ba0f471e4573bbeaf2)
@@ -22,7 +22,7 @@
 #include "CommandLineUI/CommandLineDialog.hpp"
 
+#include "CommandLineUI/CommandLineParser.hpp"
 #include "Helpers/Log.hpp"
 #include "Helpers/Verbose.hpp"
-#include "CommandLineParser.hpp"
 
 CommandLineDialog::IntsCommandLineQuery::IntsCommandLineQuery(string title, string _description) :
Index: src/UIElements/CommandLineUI/Query/MoleculeCommandLineQuery.cpp
===================================================================
--- src/UIElements/CommandLineUI/Query/MoleculeCommandLineQuery.cpp	(revision 8df74dbef13fb1628a8f98eeaac6b7c477e95818)
+++ src/UIElements/CommandLineUI/Query/MoleculeCommandLineQuery.cpp	(revision e4afb4b989433224538ab4ba0f471e4573bbeaf2)
@@ -24,7 +24,7 @@
 #include "CommandLineUI/CommandLineDialog.hpp"
 
+#include "CommandLineUI/CommandLineParser.hpp"
 #include "Helpers/Log.hpp"
 #include "Helpers/Verbose.hpp"
-#include "CommandLineParser.hpp"
 
 CommandLineDialog::MoleculeCommandLineQuery::MoleculeCommandLineQuery(string title, string _description) :
Index: src/UIElements/CommandLineUI/Query/MoleculesCommandLineQuery.cpp
===================================================================
--- src/UIElements/CommandLineUI/Query/MoleculesCommandLineQuery.cpp	(revision 8df74dbef13fb1628a8f98eeaac6b7c477e95818)
+++ src/UIElements/CommandLineUI/Query/MoleculesCommandLineQuery.cpp	(revision e4afb4b989433224538ab4ba0f471e4573bbeaf2)
@@ -24,7 +24,7 @@
 #include "CommandLineUI/CommandLineDialog.hpp"
 
+#include "CommandLineUI/CommandLineParser.hpp"
 #include "Helpers/Log.hpp"
 #include "Helpers/Verbose.hpp"
-#include "CommandLineParser.hpp"
 #include "World.hpp"
 
Index: src/UIElements/CommandLineUI/Query/StringCommandLineQuery.cpp
===================================================================
--- src/UIElements/CommandLineUI/Query/StringCommandLineQuery.cpp	(revision 8df74dbef13fb1628a8f98eeaac6b7c477e95818)
+++ src/UIElements/CommandLineUI/Query/StringCommandLineQuery.cpp	(revision e4afb4b989433224538ab4ba0f471e4573bbeaf2)
@@ -22,7 +22,7 @@
 #include "CommandLineUI/CommandLineDialog.hpp"
 
+#include "CommandLineUI/CommandLineParser.hpp"
 #include "Helpers/Log.hpp"
 #include "Helpers/Verbose.hpp"
-#include "CommandLineParser.hpp"
 
 CommandLineDialog::StringCommandLineQuery::StringCommandLineQuery(string title, string _description) :
Index: src/UIElements/CommandLineUI/Query/StringsCommandLineQuery.cpp
===================================================================
--- src/UIElements/CommandLineUI/Query/StringsCommandLineQuery.cpp	(revision 8df74dbef13fb1628a8f98eeaac6b7c477e95818)
+++ src/UIElements/CommandLineUI/Query/StringsCommandLineQuery.cpp	(revision e4afb4b989433224538ab4ba0f471e4573bbeaf2)
@@ -22,7 +22,7 @@
 #include "CommandLineUI/CommandLineDialog.hpp"
 
+#include "CommandLineUI/CommandLineParser.hpp"
 #include "Helpers/Log.hpp"
 #include "Helpers/Verbose.hpp"
-#include "CommandLineParser.hpp"
 
 CommandLineDialog::StringsCommandLineQuery::StringsCommandLineQuery(string title, string _description) :
@@ -34,5 +34,5 @@
 bool CommandLineDialog::StringsCommandLineQuery::handle() {
   if (CommandLineParser::getInstance().vm.count(getTitle())) {
-    tmp = CommandLineParser::getInstance().vm[getTitle()].as< vector<string> >();
+    tmp = CommandLineParser::getInstance().vm[getTitle()].as< std::vector<std::string> >();
     return true;
   } else {
Index: src/UIElements/CommandLineUI/Query/VectorCommandLineQuery.cpp
===================================================================
--- src/UIElements/CommandLineUI/Query/VectorCommandLineQuery.cpp	(revision 8df74dbef13fb1628a8f98eeaac6b7c477e95818)
+++ src/UIElements/CommandLineUI/Query/VectorCommandLineQuery.cpp	(revision e4afb4b989433224538ab4ba0f471e4573bbeaf2)
@@ -23,7 +23,7 @@
 
 #include "Actions/Values.hpp"
+#include "CommandLineUI/CommandLineParser.hpp"
 #include "Helpers/Log.hpp"
 #include "Helpers/Verbose.hpp"
-#include "CommandLineParser.hpp"
 #include "LinearAlgebra/Vector.hpp"
 #include "Box.hpp"
Index: src/UIElements/CommandLineUI/Query/VectorsCommandLineQuery.cpp
===================================================================
--- src/UIElements/CommandLineUI/Query/VectorsCommandLineQuery.cpp	(revision 8df74dbef13fb1628a8f98eeaac6b7c477e95818)
+++ src/UIElements/CommandLineUI/Query/VectorsCommandLineQuery.cpp	(revision e4afb4b989433224538ab4ba0f471e4573bbeaf2)
@@ -25,7 +25,7 @@
 
 #include "Actions/Values.hpp"
+#include "CommandLineUI/CommandLineParser.hpp"
 #include "Helpers/Log.hpp"
 #include "Helpers/Verbose.hpp"
-#include "CommandLineParser.hpp"
 #include "World.hpp"
 
