diff --git a/CMakeLists.txt b/CMakeLists.txt
index f3eec387..9d56029b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -612,7 +612,7 @@ endif ()
 
 add_executable(${LICENSE_GENERATOR_PROJECT_NAME} ${LICENSE_GENERATOR_FILES} ${LICENSE_GENERATOR_MAIN})
 
-create_source_groups(${LICENSE_GENERATOR_FILES})
+create_source_groups(${LICENSE_GENERATOR_FILES} ${LICENSE_GENERATOR_MAIN})
 
 set_property(
 		TARGET ${LICENSE_GENERATOR_PROJECT_NAME}
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
index a2503cc2..203fc250 100644
--- a/src/lib/CMakeLists.txt
+++ b/src/lib/CMakeLists.txt
@@ -22,7 +22,8 @@ add_files(
 	component/controller/BookmarkController.h
 	component/controller/CodeController.cpp
 	component/controller/CodeController.h
-	component/controller/Controller
+	component/controller/Controller.cpp
+	component/controller/Controller.h
 	component/controller/ErrorController.cpp
 	component/controller/ErrorController.h
 	component/controller/GraphController.cpp
@@ -335,9 +336,12 @@ add_files(
 	utility/commandline/CommandlineHelper.h
 	utility/commandline/CommandLineParser.cpp
 	utility/commandline/CommandLineParser.h
-	utility/commandline/commands/CommandlineCommand
-	utility/commandline/commands/CommandlineCommandConfig
-	utility/commandline/commands/CommandlineCommandIndex
+	utility/commandline/commands/CommandlineCommand.cpp
+	utility/commandline/commands/CommandlineCommand.h
+	utility/commandline/commands/CommandlineCommandConfig.cpp
+	utility/commandline/commands/CommandlineCommandConfig.h
+	utility/commandline/commands/CommandlineCommandIndex.cpp
+	utility/commandline/commands/CommandlineCommandIndex.h
 
 	utility/file/FileInfo.cpp
 	utility/file/FileInfo.h
diff --git a/src/lib/utility/commandline/commands/CommandlineSourceGroupOptions.cpp b/src/lib/utility/commandline/commands/CommandlineSourceGroupOptions.cpp
deleted file mode 100644
index c02722fe..00000000
--- a/src/lib/utility/commandline/commands/CommandlineSourceGroupOptions.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "commandlineSourceGroupOptions.h"
-
-CommandlineSourceGroupOptions::CommandlineSourceGroupOptions()
-{
-
-}
diff --git a/src/lib/utility/commandline/commands/CommandlineSourceGroupOptions.h b/src/lib/utility/commandline/commands/CommandlineSourceGroupOptions.h
deleted file mode 100644
index 0bb14bda..00000000
--- a/src/lib/utility/commandline/commands/CommandlineSourceGroupOptions.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef COMMANDLINE_SOURCEGROUP_OPTIONS_H
-#define COMMANDLINE_SOURCEGROUP_OPTIONS_H
-
-#include <string>
-
-#include "boost/program_options.hpp"
-
-class CommandlineSourceGroupOptions
-{
-public:
-	virtual const std::string name() const = 0;
-	virtual void setup() = 0;
-	virtual void parse(int argc, char** argv) = 0;
-
-protected:
-	boost::program_options::options_description m_options;
-};
-
-#endif // COMMANDLINE_SOURCEGROUP_OPTIONS_H
diff --git a/src/lib/utility/commandline/commands/CommandlineSourceGroupOptionsC.cpp b/src/lib/utility/commandline/commands/CommandlineSourceGroupOptionsC.cpp
deleted file mode 100644
index 184bd81f..00000000
--- a/src/lib/utility/commandline/commands/CommandlineSourceGroupOptionsC.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "CommandlineSourceGroupOptionsC.h"
-
-CommandlineSourceGroupOptionsC::CommandlineSourceGroupOptionsC()
-{
-
-}
diff --git a/src/lib/utility/commandline/commands/CommandlineSourceGroupOptionsC.h b/src/lib/utility/commandline/commands/CommandlineSourceGroupOptionsC.h
deleted file mode 100644
index 3633557a..00000000
--- a/src/lib/utility/commandline/commands/CommandlineSourceGroupOptionsC.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef COMMANDLINE_SOURCEGROUP_OPTIONS_C_H
-#define COMMANDLINE_SOURCEGROUP_OPTIONS_C_H
-
-#include "utility/commandline/modes/CommandlineSourceGroupOptions.h"
-
-class CommandlineSourceGroupOptionsC : public CommandlineSourceGroupOptions
-{
-public:
-	CommandlineSourceGroupOptionsC();
-};
-
-#endif // COMMANDLINE_SOURCEGROUP_OPTIONS_C_H
diff --git a/src/lib/utility/commandline/commands/CommandlineSourceGroupOptionsCxx.cpp b/src/lib/utility/commandline/commands/CommandlineSourceGroupOptionsCxx.cpp
deleted file mode 100644
index a3855e4c..00000000
--- a/src/lib/utility/commandline/commands/CommandlineSourceGroupOptionsCxx.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "CommandlineSourceGroupOptionsCxx.h"
-
-CommandlineSourceGroupOptionsCxx::CommandlineSourceGroupOptionsCxx()
-{
-
-}
diff --git a/src/lib/utility/commandline/commands/CommandlineSourceGroupOptionsCxx.h b/src/lib/utility/commandline/commands/CommandlineSourceGroupOptionsCxx.h
deleted file mode 100644
index 7211c52e..00000000
--- a/src/lib/utility/commandline/commands/CommandlineSourceGroupOptionsCxx.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef COMMANDLINE_SOURCEGROUP_OPTIONS_CXX_H
-#define COMMANDLINE_SOURCEGROUP_OPTIONS_CXX_H
-
-#include "utility/commandline/modes/CommandlineSourceGroupOptions.h"
-
-class CommandlineSourceGroupOptionsCxx : public CommandlineSourceGroupOptions
-{
-public:
-	CommandlineSourceGroupOptionsCxx();
-};
-
-#endif // COMMANDLINE_SOURCEGROUP_OPTIONS_CXX_H
diff --git a/src/lib/utility/commandline/commands/CommandlineSourceGroupOptionsJava.cpp b/src/lib/utility/commandline/commands/CommandlineSourceGroupOptionsJava.cpp
deleted file mode 100644
index 0692adc4..00000000
--- a/src/lib/utility/commandline/commands/CommandlineSourceGroupOptionsJava.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-#include "CommandlineSourceGroupOptionsJava.h"
-
-#include <iostream>
-
-namespace po = boost::program_options;
-
-const std::string CommandlineSourceGroupOptionsJava::name() const
-{
-	return "java";
-}
-
-void CommandlineSourceGroupOptionsJava::setup()
-{
-	m_options.add_options()
-		("help,h", "Print this help message")
-		("mavenpath,m", po::value<std::string>(), "path to the maven executable")
-		("jvmpath,j", po::value<std::string>(), "path the jvm root")
-		("excludePaths,e", po::value<std::vector<std::string>>(), "files or directories that will be excludes indexing")
-		("source-extensions", po::value<std::string>(), "extension of Sourcefiles")
-		("java-standard", po::value<int>(), "Java Standard")
-		("classpath", po::value<std::vector<std::string>>(), "Java Class Paths")
-		;
-}
-
-void CommandlineSourceGroupOptionsJava::parse(int argc, char** argv)
-{
-	po::variables_map vm;
-	po::store(po::command_line_parser(argc, argv).options(m_options).run(), vm);
-	po::notify(vm);
-
-	if (vm.count("help"))
-	{
-		std::cout << m_options << std::endl;
-	}
-
-	if (vm.count("config-file"))
-	{
-
-	}
-
-
-}
diff --git a/src/lib/utility/commandline/commands/CommandlineSourceGroupOptionsJava.h b/src/lib/utility/commandline/commands/CommandlineSourceGroupOptionsJava.h
deleted file mode 100644
index efce662f..00000000
--- a/src/lib/utility/commandline/commands/CommandlineSourceGroupOptionsJava.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef COMMANDLINE_SOURCEGROUP_OPTIONS_JAVA_H
-#define COMMANDLINE_SOURCEGROUP_OPTIONS_JAVA_H
-
-#include "utility/commandline/modes/CommandlineSourceGroupOptions.h"
-
-
-class CommandlineSourceGroupOptionsJava : public CommandlineSourceGroupOptions
-{
-	virtual const std::string name() const;
-	virtual void setup() override;
-	virtual void parse(int argc, char** argv) override;
-
-private:
-
-};
-
-#endif // COMMANDLINE_SOURCEGROUP_OPTIONS_JAVA_H