diff --git a/CoMISo/BUILD_WIN.txt b/BUILD_WIN.txt
similarity index 100%
rename from CoMISo/BUILD_WIN.txt
rename to BUILD_WIN.txt
diff --git a/CoMISo/CHANGELOG b/CHANGELOG
similarity index 100%
rename from CoMISo/CHANGELOG
rename to CHANGELOG
diff --git a/CoMISo/CMakeLists.txt b/CMakeLists.txt
similarity index 100%
rename from CoMISo/CMakeLists.txt
rename to CMakeLists.txt
diff --git a/CoMISo/COPYING b/COPYING
similarity index 100%
rename from CoMISo/COPYING
rename to COPYING
diff --git a/CoMISo/CoMISo.cmake b/CoMISo.cmake
similarity index 100%
rename from CoMISo/CoMISo.cmake
rename to CoMISo.cmake
diff --git a/CoMISo/Config/CoMISoDefines.hh b/Config/CoMISoDefines.hh
similarity index 100%
rename from CoMISo/Config/CoMISoDefines.hh
rename to Config/CoMISoDefines.hh
diff --git a/CoMISo/Config/config.hh.in b/Config/config.hh.in
similarity index 100%
rename from CoMISo/Config/config.hh.in
rename to Config/config.hh.in
diff --git a/CoMISo/EigenSolver/ArpackSolver.cc b/EigenSolver/ArpackSolver.cc
similarity index 100%
rename from CoMISo/EigenSolver/ArpackSolver.cc
rename to EigenSolver/ArpackSolver.cc
diff --git a/CoMISo/EigenSolver/ArpackSolver.hh b/EigenSolver/ArpackSolver.hh
similarity index 100%
rename from CoMISo/EigenSolver/ArpackSolver.hh
rename to EigenSolver/ArpackSolver.hh
diff --git a/CoMISo/EigenSolver/EigenArpackMatrixT.cc b/EigenSolver/EigenArpackMatrixT.cc
similarity index 100%
rename from CoMISo/EigenSolver/EigenArpackMatrixT.cc
rename to EigenSolver/EigenArpackMatrixT.cc
diff --git a/CoMISo/EigenSolver/EigenArpackMatrixT.hh b/EigenSolver/EigenArpackMatrixT.hh
similarity index 100%
rename from CoMISo/EigenSolver/EigenArpackMatrixT.hh
rename to EigenSolver/EigenArpackMatrixT.hh
diff --git a/CoMISo/Examples/factored_solver/CMakeLists.txt b/Examples/factored_solver/CMakeLists.txt
similarity index 100%
rename from CoMISo/Examples/factored_solver/CMakeLists.txt
rename to Examples/factored_solver/CMakeLists.txt
diff --git a/CoMISo/Examples/factored_solver/main.cc b/Examples/factored_solver/main.cc
similarity index 100%
rename from CoMISo/Examples/factored_solver/main.cc
rename to Examples/factored_solver/main.cc
diff --git a/CoMISo/Examples/quadratic_solver/CMakeLists.txt b/Examples/quadratic_solver/CMakeLists.txt
similarity index 100%
rename from CoMISo/Examples/quadratic_solver/CMakeLists.txt
rename to Examples/quadratic_solver/CMakeLists.txt
diff --git a/CoMISo/Examples/quadratic_solver/main.cc b/Examples/quadratic_solver/main.cc
similarity index 100%
rename from CoMISo/Examples/quadratic_solver/main.cc
rename to Examples/quadratic_solver/main.cc
diff --git a/CoMISo/Examples/small_adolc/CMakeLists.txt b/Examples/small_adolc/CMakeLists.txt
similarity index 100%
rename from CoMISo/Examples/small_adolc/CMakeLists.txt
rename to Examples/small_adolc/CMakeLists.txt
diff --git a/CoMISo/Examples/small_adolc/main.cc b/Examples/small_adolc/main.cc
similarity index 100%
rename from CoMISo/Examples/small_adolc/main.cc
rename to Examples/small_adolc/main.cc
diff --git a/CoMISo/Examples/small_cplex_soc/CMakeLists.txt b/Examples/small_cplex_soc/CMakeLists.txt
similarity index 100%
rename from CoMISo/Examples/small_cplex_soc/CMakeLists.txt
rename to Examples/small_cplex_soc/CMakeLists.txt
diff --git a/CoMISo/Examples/small_cplex_soc/main.cc b/Examples/small_cplex_soc/main.cc
similarity index 100%
rename from CoMISo/Examples/small_cplex_soc/main.cc
rename to Examples/small_cplex_soc/main.cc
diff --git a/CoMISo/Examples/small_eigenproblem/CMakeLists.txt b/Examples/small_eigenproblem/CMakeLists.txt
similarity index 100%
rename from CoMISo/Examples/small_eigenproblem/CMakeLists.txt
rename to Examples/small_eigenproblem/CMakeLists.txt
diff --git a/CoMISo/Examples/small_eigenproblem/main.cc b/Examples/small_eigenproblem/main.cc
similarity index 100%
rename from CoMISo/Examples/small_eigenproblem/main.cc
rename to Examples/small_eigenproblem/main.cc
diff --git a/CoMISo/Examples/small_factored_example/CMakeLists.txt b/Examples/small_factored_example/CMakeLists.txt
similarity index 100%
rename from CoMISo/Examples/small_factored_example/CMakeLists.txt
rename to Examples/small_factored_example/CMakeLists.txt
diff --git a/CoMISo/Examples/small_factored_example/main.cc b/Examples/small_factored_example/main.cc
similarity index 100%
rename from CoMISo/Examples/small_factored_example/main.cc
rename to Examples/small_factored_example/main.cc
diff --git a/CoMISo/Examples/small_finite_element/CMakeLists.txt b/Examples/small_finite_element/CMakeLists.txt
similarity index 100%
rename from CoMISo/Examples/small_finite_element/CMakeLists.txt
rename to Examples/small_finite_element/CMakeLists.txt
diff --git a/CoMISo/Examples/small_finite_element/main.cc b/Examples/small_finite_element/main.cc
similarity index 100%
rename from CoMISo/Examples/small_finite_element/main.cc
rename to Examples/small_finite_element/main.cc
diff --git a/CoMISo/Examples/small_linear_problem/CMakeLists.txt b/Examples/small_linear_problem/CMakeLists.txt
similarity index 100%
rename from CoMISo/Examples/small_linear_problem/CMakeLists.txt
rename to Examples/small_linear_problem/CMakeLists.txt
diff --git a/CoMISo/Examples/small_linear_problem/main.cc b/Examples/small_linear_problem/main.cc
similarity index 100%
rename from CoMISo/Examples/small_linear_problem/main.cc
rename to Examples/small_linear_problem/main.cc
diff --git a/CoMISo/Examples/small_miqp/CMakeLists.txt b/Examples/small_miqp/CMakeLists.txt
similarity index 100%
rename from CoMISo/Examples/small_miqp/CMakeLists.txt
rename to Examples/small_miqp/CMakeLists.txt
diff --git a/CoMISo/Examples/small_miqp/main.cc b/Examples/small_miqp/main.cc
similarity index 100%
rename from CoMISo/Examples/small_miqp/main.cc
rename to Examples/small_miqp/main.cc
diff --git a/CoMISo/Examples/small_nleast_squares/CMakeLists.txt b/Examples/small_nleast_squares/CMakeLists.txt
similarity index 100%
rename from CoMISo/Examples/small_nleast_squares/CMakeLists.txt
rename to Examples/small_nleast_squares/CMakeLists.txt
diff --git a/CoMISo/Examples/small_nleast_squares/main.cc b/Examples/small_nleast_squares/main.cc
similarity index 100%
rename from CoMISo/Examples/small_nleast_squares/main.cc
rename to Examples/small_nleast_squares/main.cc
diff --git a/CoMISo/Examples/small_nsolver/CMakeLists.txt b/Examples/small_nsolver/CMakeLists.txt
similarity index 100%
rename from CoMISo/Examples/small_nsolver/CMakeLists.txt
rename to Examples/small_nsolver/CMakeLists.txt
diff --git a/CoMISo/Examples/small_nsolver/main.cc b/Examples/small_nsolver/main.cc
similarity index 100%
rename from CoMISo/Examples/small_nsolver/main.cc
rename to Examples/small_nsolver/main.cc
diff --git a/CoMISo/Examples/small_quadratic_example/CMakeLists.txt b/Examples/small_quadratic_example/CMakeLists.txt
similarity index 100%
rename from CoMISo/Examples/small_quadratic_example/CMakeLists.txt
rename to Examples/small_quadratic_example/CMakeLists.txt
diff --git a/CoMISo/Examples/small_quadratic_example/main.cc b/Examples/small_quadratic_example/main.cc
similarity index 100%
rename from CoMISo/Examples/small_quadratic_example/main.cc
rename to Examples/small_quadratic_example/main.cc
diff --git a/CoMISo/Examples/small_quadratic_resolve_example/CMakeLists.txt b/Examples/small_quadratic_resolve_example/CMakeLists.txt
similarity index 100%
rename from CoMISo/Examples/small_quadratic_resolve_example/CMakeLists.txt
rename to Examples/small_quadratic_resolve_example/CMakeLists.txt
diff --git a/CoMISo/Examples/small_quadratic_resolve_example/main.cc b/Examples/small_quadratic_resolve_example/main.cc
similarity index 100%
rename from CoMISo/Examples/small_quadratic_resolve_example/main.cc
rename to Examples/small_quadratic_resolve_example/main.cc
diff --git a/CoMISo/Examples/small_sparseqr/CMakeLists.txt b/Examples/small_sparseqr/CMakeLists.txt
similarity index 100%
rename from CoMISo/Examples/small_sparseqr/CMakeLists.txt
rename to Examples/small_sparseqr/CMakeLists.txt
diff --git a/CoMISo/Examples/small_sparseqr/main.cc b/Examples/small_sparseqr/main.cc
similarity index 100%
rename from CoMISo/Examples/small_sparseqr/main.cc
rename to Examples/small_sparseqr/main.cc
diff --git a/CoMISo/NSolver/BoundConstraint.cc b/NSolver/BoundConstraint.cc
similarity index 100%
rename from CoMISo/NSolver/BoundConstraint.cc
rename to NSolver/BoundConstraint.cc
diff --git a/CoMISo/NSolver/BoundConstraint.hh b/NSolver/BoundConstraint.hh
similarity index 100%
rename from CoMISo/NSolver/BoundConstraint.hh
rename to NSolver/BoundConstraint.hh
diff --git a/CoMISo/NSolver/CBCSolver.cc b/NSolver/CBCSolver.cc
similarity index 100%
rename from CoMISo/NSolver/CBCSolver.cc
rename to NSolver/CBCSolver.cc
diff --git a/CoMISo/NSolver/CBCSolver.hh b/NSolver/CBCSolver.hh
similarity index 100%
rename from CoMISo/NSolver/CBCSolver.hh
rename to NSolver/CBCSolver.hh
diff --git a/CoMISo/NSolver/COMISOSolver.cc b/NSolver/COMISOSolver.cc
similarity index 100%
rename from CoMISo/NSolver/COMISOSolver.cc
rename to NSolver/COMISOSolver.cc
diff --git a/CoMISo/NSolver/COMISOSolver.hh b/NSolver/COMISOSolver.hh
similarity index 100%
rename from CoMISo/NSolver/COMISOSolver.hh
rename to NSolver/COMISOSolver.hh
diff --git a/CoMISo/NSolver/CPLEXSolver.cc b/NSolver/CPLEXSolver.cc
similarity index 100%
rename from CoMISo/NSolver/CPLEXSolver.cc
rename to NSolver/CPLEXSolver.cc
diff --git a/CoMISo/NSolver/CPLEXSolver.hh b/NSolver/CPLEXSolver.hh
similarity index 100%
rename from CoMISo/NSolver/CPLEXSolver.hh
rename to NSolver/CPLEXSolver.hh
diff --git a/CoMISo/NSolver/CPLEXSolverT.cc b/NSolver/CPLEXSolverT.cc
similarity index 100%
rename from CoMISo/NSolver/CPLEXSolverT.cc
rename to NSolver/CPLEXSolverT.cc
diff --git a/CoMISo/NSolver/ConeConstraint.cc b/NSolver/ConeConstraint.cc
similarity index 100%
rename from CoMISo/NSolver/ConeConstraint.cc
rename to NSolver/ConeConstraint.cc
diff --git a/CoMISo/NSolver/ConeConstraint.hh b/NSolver/ConeConstraint.hh
similarity index 100%
rename from CoMISo/NSolver/ConeConstraint.hh
rename to NSolver/ConeConstraint.hh
diff --git a/CoMISo/NSolver/FiniteElementProblem.cc b/NSolver/FiniteElementProblem.cc
similarity index 100%
rename from CoMISo/NSolver/FiniteElementProblem.cc
rename to NSolver/FiniteElementProblem.cc
diff --git a/CoMISo/NSolver/FiniteElementProblem.hh b/NSolver/FiniteElementProblem.hh
similarity index 100%
rename from CoMISo/NSolver/FiniteElementProblem.hh
rename to NSolver/FiniteElementProblem.hh
diff --git a/CoMISo/NSolver/GUROBISolver.cc b/NSolver/GUROBISolver.cc
similarity index 100%
rename from CoMISo/NSolver/GUROBISolver.cc
rename to NSolver/GUROBISolver.cc
diff --git a/CoMISo/NSolver/GUROBISolver.hh b/NSolver/GUROBISolver.hh
similarity index 100%
rename from CoMISo/NSolver/GUROBISolver.hh
rename to NSolver/GUROBISolver.hh
diff --git a/CoMISo/NSolver/GurobiHelper.cc b/NSolver/GurobiHelper.cc
similarity index 100%
rename from CoMISo/NSolver/GurobiHelper.cc
rename to NSolver/GurobiHelper.cc
diff --git a/CoMISo/NSolver/GurobiHelper.hh b/NSolver/GurobiHelper.hh
similarity index 100%
rename from CoMISo/NSolver/GurobiHelper.hh
rename to NSolver/GurobiHelper.hh
diff --git a/CoMISo/NSolver/IPOPTSolver.cc b/NSolver/IPOPTSolver.cc
similarity index 100%
rename from CoMISo/NSolver/IPOPTSolver.cc
rename to NSolver/IPOPTSolver.cc
diff --git a/CoMISo/NSolver/IPOPTSolver.hh b/NSolver/IPOPTSolver.hh
similarity index 100%
rename from CoMISo/NSolver/IPOPTSolver.hh
rename to NSolver/IPOPTSolver.hh
diff --git a/CoMISo/NSolver/LeastSquaresProblem.cc b/NSolver/LeastSquaresProblem.cc
similarity index 100%
rename from CoMISo/NSolver/LeastSquaresProblem.cc
rename to NSolver/LeastSquaresProblem.cc
diff --git a/CoMISo/NSolver/LeastSquaresProblem.hh b/NSolver/LeastSquaresProblem.hh
similarity index 100%
rename from CoMISo/NSolver/LeastSquaresProblem.hh
rename to NSolver/LeastSquaresProblem.hh
diff --git a/CoMISo/NSolver/LinearConstraint.cc b/NSolver/LinearConstraint.cc
similarity index 100%
rename from CoMISo/NSolver/LinearConstraint.cc
rename to NSolver/LinearConstraint.cc
diff --git a/CoMISo/NSolver/LinearConstraint.hh b/NSolver/LinearConstraint.hh
similarity index 100%
rename from CoMISo/NSolver/LinearConstraint.hh
rename to NSolver/LinearConstraint.hh
diff --git a/CoMISo/NSolver/LinearConstraintHandlerElimination.cc b/NSolver/LinearConstraintHandlerElimination.cc
similarity index 100%
rename from CoMISo/NSolver/LinearConstraintHandlerElimination.cc
rename to NSolver/LinearConstraintHandlerElimination.cc
diff --git a/CoMISo/NSolver/LinearConstraintHandlerElimination.hh b/NSolver/LinearConstraintHandlerElimination.hh
similarity index 100%
rename from CoMISo/NSolver/LinearConstraintHandlerElimination.hh
rename to NSolver/LinearConstraintHandlerElimination.hh
diff --git a/CoMISo/NSolver/LinearConstraintHandlerEliminationT.cc b/NSolver/LinearConstraintHandlerEliminationT.cc
similarity index 100%
rename from CoMISo/NSolver/LinearConstraintHandlerEliminationT.cc
rename to NSolver/LinearConstraintHandlerEliminationT.cc
diff --git a/CoMISo/NSolver/LinearConstraintHandlerPenalty.cc b/NSolver/LinearConstraintHandlerPenalty.cc
similarity index 100%
rename from CoMISo/NSolver/LinearConstraintHandlerPenalty.cc
rename to NSolver/LinearConstraintHandlerPenalty.cc
diff --git a/CoMISo/NSolver/LinearConstraintHandlerPenalty.hh b/NSolver/LinearConstraintHandlerPenalty.hh
similarity index 100%
rename from CoMISo/NSolver/LinearConstraintHandlerPenalty.hh
rename to NSolver/LinearConstraintHandlerPenalty.hh
diff --git a/CoMISo/NSolver/LinearConstraintHandlerPenaltyT.cc b/NSolver/LinearConstraintHandlerPenaltyT.cc
similarity index 100%
rename from CoMISo/NSolver/LinearConstraintHandlerPenaltyT.cc
rename to NSolver/LinearConstraintHandlerPenaltyT.cc
diff --git a/CoMISo/NSolver/LinearProblem.cc b/NSolver/LinearProblem.cc
similarity index 100%
rename from CoMISo/NSolver/LinearProblem.cc
rename to NSolver/LinearProblem.cc
diff --git a/CoMISo/NSolver/LinearProblem.hh b/NSolver/LinearProblem.hh
similarity index 100%
rename from CoMISo/NSolver/LinearProblem.hh
rename to NSolver/LinearProblem.hh
diff --git a/CoMISo/NSolver/NConstraintInterface.hh b/NSolver/NConstraintInterface.hh
similarity index 100%
rename from CoMISo/NSolver/NConstraintInterface.hh
rename to NSolver/NConstraintInterface.hh
diff --git a/CoMISo/NSolver/NConstraintInterfaceAD.hpp b/NSolver/NConstraintInterfaceAD.hpp
similarity index 100%
rename from CoMISo/NSolver/NConstraintInterfaceAD.hpp
rename to NSolver/NConstraintInterfaceAD.hpp
diff --git a/CoMISo/NSolver/NConstraintInterfaceADOLC.hpp b/NSolver/NConstraintInterfaceADOLC.hpp
similarity index 100%
rename from CoMISo/NSolver/NConstraintInterfaceADOLC.hpp
rename to NSolver/NConstraintInterfaceADOLC.hpp
diff --git a/CoMISo/NSolver/NPDerivativeChecker.cc b/NSolver/NPDerivativeChecker.cc
similarity index 100%
rename from CoMISo/NSolver/NPDerivativeChecker.cc
rename to NSolver/NPDerivativeChecker.cc
diff --git a/CoMISo/NSolver/NPDerivativeChecker.hh b/NSolver/NPDerivativeChecker.hh
similarity index 100%
rename from CoMISo/NSolver/NPDerivativeChecker.hh
rename to NSolver/NPDerivativeChecker.hh
diff --git a/CoMISo/NSolver/NPLinearConstraints.cc b/NSolver/NPLinearConstraints.cc
similarity index 100%
rename from CoMISo/NSolver/NPLinearConstraints.cc
rename to NSolver/NPLinearConstraints.cc
diff --git a/CoMISo/NSolver/NPLinearConstraints.hh b/NSolver/NPLinearConstraints.hh
similarity index 100%
rename from CoMISo/NSolver/NPLinearConstraints.hh
rename to NSolver/NPLinearConstraints.hh
diff --git a/CoMISo/NSolver/NPLinearConstraintsT.cc b/NSolver/NPLinearConstraintsT.cc
similarity index 100%
rename from CoMISo/NSolver/NPLinearConstraintsT.cc
rename to NSolver/NPLinearConstraintsT.cc
diff --git a/CoMISo/NSolver/NPTiming.cc b/NSolver/NPTiming.cc
similarity index 100%
rename from CoMISo/NSolver/NPTiming.cc
rename to NSolver/NPTiming.cc
diff --git a/CoMISo/NSolver/NPTiming.hh b/NSolver/NPTiming.hh
similarity index 100%
rename from CoMISo/NSolver/NPTiming.hh
rename to NSolver/NPTiming.hh
diff --git a/CoMISo/NSolver/NProblemGmmInterface.hh b/NSolver/NProblemGmmInterface.hh
similarity index 100%
rename from CoMISo/NSolver/NProblemGmmInterface.hh
rename to NSolver/NProblemGmmInterface.hh
diff --git a/CoMISo/NSolver/NProblemInterface.cc b/NSolver/NProblemInterface.cc
similarity index 100%
rename from CoMISo/NSolver/NProblemInterface.cc
rename to NSolver/NProblemInterface.cc
diff --git a/CoMISo/NSolver/NProblemInterface.hh b/NSolver/NProblemInterface.hh
similarity index 100%
rename from CoMISo/NSolver/NProblemInterface.hh
rename to NSolver/NProblemInterface.hh
diff --git a/CoMISo/NSolver/NProblemInterfaceAD.hpp b/NSolver/NProblemInterfaceAD.hpp
similarity index 100%
rename from CoMISo/NSolver/NProblemInterfaceAD.hpp
rename to NSolver/NProblemInterfaceAD.hpp
diff --git a/CoMISo/NSolver/NProblemInterfaceADOLC.hh b/NSolver/NProblemInterfaceADOLC.hh
similarity index 100%
rename from CoMISo/NSolver/NProblemInterfaceADOLC.hh
rename to NSolver/NProblemInterfaceADOLC.hh
diff --git a/CoMISo/NSolver/NProblemInterfaceDCO.hh b/NSolver/NProblemInterfaceDCO.hh
similarity index 100%
rename from CoMISo/NSolver/NProblemInterfaceDCO.hh
rename to NSolver/NProblemInterfaceDCO.hh
diff --git a/CoMISo/NSolver/NewtonSolver.cc b/NSolver/NewtonSolver.cc
similarity index 100%
rename from CoMISo/NSolver/NewtonSolver.cc
rename to NSolver/NewtonSolver.cc
diff --git a/CoMISo/NSolver/NewtonSolver.hh b/NSolver/NewtonSolver.hh
similarity index 100%
rename from CoMISo/NSolver/NewtonSolver.hh
rename to NSolver/NewtonSolver.hh
diff --git a/CoMISo/NSolver/QuadraticProblem.hh b/NSolver/QuadraticProblem.hh
similarity index 100%
rename from CoMISo/NSolver/QuadraticProblem.hh
rename to NSolver/QuadraticProblem.hh
diff --git a/CoMISo/NSolver/SuperSparseMatrixT.cc b/NSolver/SuperSparseMatrixT.cc
similarity index 100%
rename from CoMISo/NSolver/SuperSparseMatrixT.cc
rename to NSolver/SuperSparseMatrixT.cc
diff --git a/CoMISo/NSolver/SuperSparseMatrixT.hh b/NSolver/SuperSparseMatrixT.hh
similarity index 100%
rename from CoMISo/NSolver/SuperSparseMatrixT.hh
rename to NSolver/SuperSparseMatrixT.hh
diff --git a/CoMISo/NSolver/TAOSolver.cc b/NSolver/TAOSolver.cc
similarity index 100%
rename from CoMISo/NSolver/TAOSolver.cc
rename to NSolver/TAOSolver.cc
diff --git a/CoMISo/NSolver/TAOSolver.hh b/NSolver/TAOSolver.hh
similarity index 100%
rename from CoMISo/NSolver/TAOSolver.hh
rename to NSolver/TAOSolver.hh
diff --git a/CoMISo/NSolver/TapeIDSingleton.cc b/NSolver/TapeIDSingleton.cc
similarity index 100%
rename from CoMISo/NSolver/TapeIDSingleton.cc
rename to NSolver/TapeIDSingleton.cc
diff --git a/CoMISo/NSolver/TapeIDSingleton.hh b/NSolver/TapeIDSingleton.hh
similarity index 100%
rename from CoMISo/NSolver/TapeIDSingleton.hh
rename to NSolver/TapeIDSingleton.hh
diff --git a/CoMISo/NSolver/TestInterface.hh b/NSolver/TestInterface.hh
similarity index 100%
rename from CoMISo/NSolver/TestInterface.hh
rename to NSolver/TestInterface.hh
diff --git a/CoMISo/NSolver/VariableType.hh b/NSolver/VariableType.hh
similarity index 100%
rename from CoMISo/NSolver/VariableType.hh
rename to NSolver/VariableType.hh
diff --git a/Plugin-HarmonicExample/CHANGELOG b/OpenFlipper-Plugin-Examples/Plugin-HarmonicExample/CHANGELOG
similarity index 100%
rename from Plugin-HarmonicExample/CHANGELOG
rename to OpenFlipper-Plugin-Examples/Plugin-HarmonicExample/CHANGELOG
diff --git a/Plugin-HarmonicExample/CMakeLists.txt b/OpenFlipper-Plugin-Examples/Plugin-HarmonicExample/CMakeLists.txt
similarity index 100%
rename from Plugin-HarmonicExample/CMakeLists.txt
rename to OpenFlipper-Plugin-Examples/Plugin-HarmonicExample/CMakeLists.txt
diff --git a/Plugin-HarmonicExample/COPYING b/OpenFlipper-Plugin-Examples/Plugin-HarmonicExample/COPYING
similarity index 100%
rename from Plugin-HarmonicExample/COPYING
rename to OpenFlipper-Plugin-Examples/Plugin-HarmonicExample/COPYING
diff --git a/Plugin-HarmonicExample/ColorCoder.hh b/OpenFlipper-Plugin-Examples/Plugin-HarmonicExample/ColorCoder.hh
similarity index 100%
rename from Plugin-HarmonicExample/ColorCoder.hh
rename to OpenFlipper-Plugin-Examples/Plugin-HarmonicExample/ColorCoder.hh
diff --git a/Plugin-HarmonicExample/HarmonicExamplePerObjectDataT.hh b/OpenFlipper-Plugin-Examples/Plugin-HarmonicExample/HarmonicExamplePerObjectDataT.hh
similarity index 100%
rename from Plugin-HarmonicExample/HarmonicExamplePerObjectDataT.hh
rename to OpenFlipper-Plugin-Examples/Plugin-HarmonicExample/HarmonicExamplePerObjectDataT.hh
diff --git a/Plugin-HarmonicExample/HarmonicExamplePlugin.cc b/OpenFlipper-Plugin-Examples/Plugin-HarmonicExample/HarmonicExamplePlugin.cc
similarity index 100%
rename from Plugin-HarmonicExample/HarmonicExamplePlugin.cc
rename to OpenFlipper-Plugin-Examples/Plugin-HarmonicExample/HarmonicExamplePlugin.cc
diff --git a/Plugin-HarmonicExample/HarmonicExamplePlugin.hh b/OpenFlipper-Plugin-Examples/Plugin-HarmonicExample/HarmonicExamplePlugin.hh
similarity index 100%
rename from Plugin-HarmonicExample/HarmonicExamplePlugin.hh
rename to OpenFlipper-Plugin-Examples/Plugin-HarmonicExample/HarmonicExamplePlugin.hh
diff --git a/Plugin-HarmonicExample/HarmonicExampleT.cc b/OpenFlipper-Plugin-Examples/Plugin-HarmonicExample/HarmonicExampleT.cc
similarity index 100%
rename from Plugin-HarmonicExample/HarmonicExampleT.cc
rename to OpenFlipper-Plugin-Examples/Plugin-HarmonicExample/HarmonicExampleT.cc
diff --git a/Plugin-HarmonicExample/HarmonicExampleT.hh b/OpenFlipper-Plugin-Examples/Plugin-HarmonicExample/HarmonicExampleT.hh
similarity index 100%
rename from Plugin-HarmonicExample/HarmonicExampleT.hh
rename to OpenFlipper-Plugin-Examples/Plugin-HarmonicExample/HarmonicExampleT.hh
diff --git a/Plugin-HarmonicExample/HarmonicExampleToolbar.hh b/OpenFlipper-Plugin-Examples/Plugin-HarmonicExample/HarmonicExampleToolbar.hh
similarity index 100%
rename from Plugin-HarmonicExample/HarmonicExampleToolbar.hh
rename to OpenFlipper-Plugin-Examples/Plugin-HarmonicExample/HarmonicExampleToolbar.hh
diff --git a/Plugin-HarmonicExample/HarmonicExampleToolbarBase.ui b/OpenFlipper-Plugin-Examples/Plugin-HarmonicExample/HarmonicExampleToolbarBase.ui
similarity index 100%
rename from Plugin-HarmonicExample/HarmonicExampleToolbarBase.ui
rename to OpenFlipper-Plugin-Examples/Plugin-HarmonicExample/HarmonicExampleToolbarBase.ui
diff --git a/Plugin-HarmonicExample/Plugin-HarmonicExample.pro b/OpenFlipper-Plugin-Examples/Plugin-HarmonicExample/Plugin-HarmonicExample.pro
similarity index 100%
rename from Plugin-HarmonicExample/Plugin-HarmonicExample.pro
rename to OpenFlipper-Plugin-Examples/Plugin-HarmonicExample/Plugin-HarmonicExample.pro
diff --git a/Plugin-HarmonicExample/open_cylinder.off b/OpenFlipper-Plugin-Examples/Plugin-HarmonicExample/open_cylinder.off
similarity index 100%
rename from Plugin-HarmonicExample/open_cylinder.off
rename to OpenFlipper-Plugin-Examples/Plugin-HarmonicExample/open_cylinder.off
diff --git a/CoMISo/QtWidgets/MISolverDialogUI.cc b/QtWidgets/MISolverDialogUI.cc
similarity index 100%
rename from CoMISo/QtWidgets/MISolverDialogUI.cc
rename to QtWidgets/MISolverDialogUI.cc
diff --git a/CoMISo/QtWidgets/MISolverDialogUI.hh b/QtWidgets/MISolverDialogUI.hh
similarity index 100%
rename from CoMISo/QtWidgets/MISolverDialogUI.hh
rename to QtWidgets/MISolverDialogUI.hh
diff --git a/CoMISo/QtWidgets/QtMISolverDialogBaseUI.ui b/QtWidgets/QtMISolverDialogBaseUI.ui
similarity index 100%
rename from CoMISo/QtWidgets/QtMISolverDialogBaseUI.ui
rename to QtWidgets/QtMISolverDialogBaseUI.ui
diff --git a/CoMISo/README.txt b/README.txt
similarity index 100%
rename from CoMISo/README.txt
rename to README.txt
diff --git a/CoMISo/Solver/CholmodSolver.cc b/Solver/CholmodSolver.cc
similarity index 100%
rename from CoMISo/Solver/CholmodSolver.cc
rename to Solver/CholmodSolver.cc
diff --git a/CoMISo/Solver/CholmodSolver.hh b/Solver/CholmodSolver.hh
similarity index 100%
rename from CoMISo/Solver/CholmodSolver.hh
rename to Solver/CholmodSolver.hh
diff --git a/CoMISo/Solver/CholmodSolverT.cc b/Solver/CholmodSolverT.cc
similarity index 100%
rename from CoMISo/Solver/CholmodSolverT.cc
rename to Solver/CholmodSolverT.cc
diff --git a/CoMISo/Solver/ConstrainedSolver.cc b/Solver/ConstrainedSolver.cc
similarity index 100%
rename from CoMISo/Solver/ConstrainedSolver.cc
rename to Solver/ConstrainedSolver.cc
diff --git a/CoMISo/Solver/ConstrainedSolver.hh b/Solver/ConstrainedSolver.hh
similarity index 100%
rename from CoMISo/Solver/ConstrainedSolver.hh
rename to Solver/ConstrainedSolver.hh
diff --git a/CoMISo/Solver/ConstrainedSolverT.cc b/Solver/ConstrainedSolverT.cc
similarity index 100%
rename from CoMISo/Solver/ConstrainedSolverT.cc
rename to Solver/ConstrainedSolverT.cc
diff --git a/CoMISo/Solver/EigenLDLTSolver.cc b/Solver/EigenLDLTSolver.cc
similarity index 100%
rename from CoMISo/Solver/EigenLDLTSolver.cc
rename to Solver/EigenLDLTSolver.cc
diff --git a/CoMISo/Solver/EigenLDLTSolver.hh b/Solver/EigenLDLTSolver.hh
similarity index 100%
rename from CoMISo/Solver/EigenLDLTSolver.hh
rename to Solver/EigenLDLTSolver.hh
diff --git a/CoMISo/Solver/EigenLDLTSolverT.cc b/Solver/EigenLDLTSolverT.cc
similarity index 100%
rename from CoMISo/Solver/EigenLDLTSolverT.cc
rename to Solver/EigenLDLTSolverT.cc
diff --git a/CoMISo/Solver/Eigen_Tools.cc b/Solver/Eigen_Tools.cc
similarity index 100%
rename from CoMISo/Solver/Eigen_Tools.cc
rename to Solver/Eigen_Tools.cc
diff --git a/CoMISo/Solver/Eigen_Tools.hh b/Solver/Eigen_Tools.hh
similarity index 100%
rename from CoMISo/Solver/Eigen_Tools.hh
rename to Solver/Eigen_Tools.hh
diff --git a/CoMISo/Solver/GMM_Tools.cc b/Solver/GMM_Tools.cc
similarity index 100%
rename from CoMISo/Solver/GMM_Tools.cc
rename to Solver/GMM_Tools.cc
diff --git a/CoMISo/Solver/GMM_Tools.hh b/Solver/GMM_Tools.hh
similarity index 100%
rename from CoMISo/Solver/GMM_Tools.hh
rename to Solver/GMM_Tools.hh
diff --git a/CoMISo/Solver/IterativeSolverT.cc b/Solver/IterativeSolverT.cc
similarity index 100%
rename from CoMISo/Solver/IterativeSolverT.cc
rename to Solver/IterativeSolverT.cc
diff --git a/CoMISo/Solver/IterativeSolverT.hh b/Solver/IterativeSolverT.hh
similarity index 100%
rename from CoMISo/Solver/IterativeSolverT.hh
rename to Solver/IterativeSolverT.hh
diff --git a/CoMISo/Solver/MISolver.cc b/Solver/MISolver.cc
similarity index 100%
rename from CoMISo/Solver/MISolver.cc
rename to Solver/MISolver.cc
diff --git a/CoMISo/Solver/MISolver.hh b/Solver/MISolver.hh
similarity index 100%
rename from CoMISo/Solver/MISolver.hh
rename to Solver/MISolver.hh
diff --git a/CoMISo/Solver/MISolverT.cc b/Solver/MISolverT.cc
similarity index 100%
rename from CoMISo/Solver/MISolverT.cc
rename to Solver/MISolverT.cc
diff --git a/CoMISo/Solver/SparseQRSolver.cc b/Solver/SparseQRSolver.cc
similarity index 100%
rename from CoMISo/Solver/SparseQRSolver.cc
rename to Solver/SparseQRSolver.cc
diff --git a/CoMISo/Solver/SparseQRSolver.hh b/Solver/SparseQRSolver.hh
similarity index 100%
rename from CoMISo/Solver/SparseQRSolver.hh
rename to Solver/SparseQRSolver.hh
diff --git a/CoMISo/Solver/SparseQRSolverT.cc b/Solver/SparseQRSolverT.cc
similarity index 100%
rename from CoMISo/Solver/SparseQRSolverT.cc
rename to Solver/SparseQRSolverT.cc
diff --git a/CoMISo/Solver/TaucsSolver.cc b/Solver/TaucsSolver.cc
similarity index 100%
rename from CoMISo/Solver/TaucsSolver.cc
rename to Solver/TaucsSolver.cc
diff --git a/CoMISo/Solver/TaucsSolver.hh b/Solver/TaucsSolver.hh
similarity index 100%
rename from CoMISo/Solver/TaucsSolver.hh
rename to Solver/TaucsSolver.hh
diff --git a/CoMISo/Solver/TaucsSolverT.cc b/Solver/TaucsSolverT.cc
similarity index 100%
rename from CoMISo/Solver/TaucsSolverT.cc
rename to Solver/TaucsSolverT.cc
diff --git a/CoMISo/Solver/UMFPACKSolver.cc b/Solver/UMFPACKSolver.cc
similarity index 100%
rename from CoMISo/Solver/UMFPACKSolver.cc
rename to Solver/UMFPACKSolver.cc
diff --git a/CoMISo/Solver/UMFPACKSolver.hh b/Solver/UMFPACKSolver.hh
similarity index 100%
rename from CoMISo/Solver/UMFPACKSolver.hh
rename to Solver/UMFPACKSolver.hh
diff --git a/CoMISo/Solver/UMFPACKSolverT.cc b/Solver/UMFPACKSolverT.cc
similarity index 100%
rename from CoMISo/Solver/UMFPACKSolverT.cc
rename to Solver/UMFPACKSolverT.cc
diff --git a/CoMISo/Utils/MutablePriorityQueueT.hh b/Utils/MutablePriorityQueueT.hh
similarity index 100%
rename from CoMISo/Utils/MutablePriorityQueueT.hh
rename to Utils/MutablePriorityQueueT.hh
diff --git a/CoMISo/Utils/SmartPointer.hh b/Utils/SmartPointer.hh
similarity index 100%
rename from CoMISo/Utils/SmartPointer.hh
rename to Utils/SmartPointer.hh
diff --git a/CoMISo/Utils/StopWatch.hh b/Utils/StopWatch.hh
similarity index 100%
rename from CoMISo/Utils/StopWatch.hh
rename to Utils/StopWatch.hh
diff --git a/CoMISo/Utils/VSToolsT.hh b/Utils/VSToolsT.hh
similarity index 100%
rename from CoMISo/Utils/VSToolsT.hh
rename to Utils/VSToolsT.hh
diff --git a/CoMISo/Utils/omp.hh b/Utils/omp.hh
similarity index 100%
rename from CoMISo/Utils/omp.hh
rename to Utils/omp.hh
diff --git a/CoMISo/VERSION b/VERSION
similarity index 100%
rename from CoMISo/VERSION
rename to VERSION
diff --git a/CoMISo/cmake/ACGCommon.cmake b/cmake/ACGCommon.cmake
similarity index 100%
rename from CoMISo/cmake/ACGCommon.cmake
rename to cmake/ACGCommon.cmake
diff --git a/CoMISo/cmake/ACGCompiler.cmake b/cmake/ACGCompiler.cmake
similarity index 100%
rename from CoMISo/cmake/ACGCompiler.cmake
rename to cmake/ACGCompiler.cmake
diff --git a/CoMISo/cmake/ACGOutput.cmake b/cmake/ACGOutput.cmake
similarity index 100%
rename from CoMISo/cmake/ACGOutput.cmake
rename to cmake/ACGOutput.cmake
diff --git a/CoMISo/cmake/CGAL_FindPackageHandleStandardArgs.cmake b/cmake/CGAL_FindPackageHandleStandardArgs.cmake
similarity index 100%
rename from CoMISo/cmake/CGAL_FindPackageHandleStandardArgs.cmake
rename to cmake/CGAL_FindPackageHandleStandardArgs.cmake
diff --git a/CoMISo/cmake/CGAL_GeneratorSpecificSettings.cmake b/cmake/CGAL_GeneratorSpecificSettings.cmake
similarity index 100%
rename from CoMISo/cmake/CGAL_GeneratorSpecificSettings.cmake
rename to cmake/CGAL_GeneratorSpecificSettings.cmake
diff --git a/CoMISo/cmake/CGAL_Locate_CGAL_TAUCS.cmake b/cmake/CGAL_Locate_CGAL_TAUCS.cmake
similarity index 100%
rename from CoMISo/cmake/CGAL_Locate_CGAL_TAUCS.cmake
rename to cmake/CGAL_Locate_CGAL_TAUCS.cmake
diff --git a/CoMISo/cmake/CGAL_Macros.cmake b/cmake/CGAL_Macros.cmake
similarity index 100%
rename from CoMISo/cmake/CGAL_Macros.cmake
rename to cmake/CGAL_Macros.cmake
diff --git a/CoMISo/cmake/CheckCSourceRuns.cmake b/cmake/CheckCSourceRuns.cmake
similarity index 100%
rename from CoMISo/cmake/CheckCSourceRuns.cmake
rename to cmake/CheckCSourceRuns.cmake
diff --git a/CoMISo/cmake/CoMISoExample.cmake b/cmake/CoMISoExample.cmake
similarity index 100%
rename from CoMISo/cmake/CoMISoExample.cmake
rename to cmake/CoMISoExample.cmake
diff --git a/CoMISo/cmake/FindADOLC.cmake b/cmake/FindADOLC.cmake
similarity index 100%
rename from CoMISo/cmake/FindADOLC.cmake
rename to cmake/FindADOLC.cmake
diff --git a/CoMISo/cmake/FindARPACK.cmake b/cmake/FindARPACK.cmake
similarity index 100%
rename from CoMISo/cmake/FindARPACK.cmake
rename to cmake/FindARPACK.cmake
diff --git a/CoMISo/cmake/FindBLAS.cmake b/cmake/FindBLAS.cmake
similarity index 100%
rename from CoMISo/cmake/FindBLAS.cmake
rename to cmake/FindBLAS.cmake
diff --git a/CoMISo/cmake/FindCBC.cmake b/cmake/FindCBC.cmake
similarity index 100%
rename from CoMISo/cmake/FindCBC.cmake
rename to cmake/FindCBC.cmake
diff --git a/CoMISo/cmake/FindCGAL.cmake b/cmake/FindCGAL.cmake
similarity index 100%
rename from CoMISo/cmake/FindCGAL.cmake
rename to cmake/FindCGAL.cmake
diff --git a/CoMISo/cmake/FindCGL.cmake b/cmake/FindCGL.cmake
similarity index 100%
rename from CoMISo/cmake/FindCGL.cmake
rename to cmake/FindCGL.cmake
diff --git a/CoMISo/cmake/FindCLP.cmake b/cmake/FindCLP.cmake
similarity index 100%
rename from CoMISo/cmake/FindCLP.cmake
rename to cmake/FindCLP.cmake
diff --git a/CoMISo/cmake/FindCOINUTILS.cmake b/cmake/FindCOINUTILS.cmake
similarity index 100%
rename from CoMISo/cmake/FindCOINUTILS.cmake
rename to cmake/FindCOINUTILS.cmake
diff --git a/CoMISo/cmake/FindCPLEX.cmake b/cmake/FindCPLEX.cmake
similarity index 100%
rename from CoMISo/cmake/FindCPLEX.cmake
rename to cmake/FindCPLEX.cmake
diff --git a/CoMISo/cmake/FindCoMISo.cmake b/cmake/FindCoMISo.cmake
similarity index 100%
rename from CoMISo/cmake/FindCoMISo.cmake
rename to cmake/FindCoMISo.cmake
diff --git a/CoMISo/cmake/FindDCO.cmake b/cmake/FindDCO.cmake
similarity index 100%
rename from CoMISo/cmake/FindDCO.cmake
rename to cmake/FindDCO.cmake
diff --git a/CoMISo/cmake/FindEIGEN3.cmake b/cmake/FindEIGEN3.cmake
similarity index 100%
rename from CoMISo/cmake/FindEIGEN3.cmake
rename to cmake/FindEIGEN3.cmake
diff --git a/CoMISo/cmake/FindGMM.cmake b/cmake/FindGMM.cmake
similarity index 100%
rename from CoMISo/cmake/FindGMM.cmake
rename to cmake/FindGMM.cmake
diff --git a/CoMISo/cmake/FindGMP.cmake b/cmake/FindGMP.cmake
similarity index 100%
rename from CoMISo/cmake/FindGMP.cmake
rename to cmake/FindGMP.cmake
diff --git a/CoMISo/cmake/FindGUROBI.cmake b/cmake/FindGUROBI.cmake
similarity index 100%
rename from CoMISo/cmake/FindGUROBI.cmake
rename to cmake/FindGUROBI.cmake
diff --git a/CoMISo/cmake/FindIPOPT.cmake b/cmake/FindIPOPT.cmake
similarity index 100%
rename from CoMISo/cmake/FindIPOPT.cmake
rename to cmake/FindIPOPT.cmake
diff --git a/CoMISo/cmake/FindLAPACK.cmake b/cmake/FindLAPACK.cmake
similarity index 100%
rename from CoMISo/cmake/FindLAPACK.cmake
rename to cmake/FindLAPACK.cmake
diff --git a/CoMISo/cmake/FindMETIS.cmake b/cmake/FindMETIS.cmake
similarity index 100%
rename from CoMISo/cmake/FindMETIS.cmake
rename to cmake/FindMETIS.cmake
diff --git a/CoMISo/cmake/FindMPI.cmake b/cmake/FindMPI.cmake
similarity index 100%
rename from CoMISo/cmake/FindMPI.cmake
rename to cmake/FindMPI.cmake
diff --git a/CoMISo/cmake/FindMUMPS.cmake b/cmake/FindMUMPS.cmake
similarity index 100%
rename from CoMISo/cmake/FindMUMPS.cmake
rename to cmake/FindMUMPS.cmake
diff --git a/CoMISo/cmake/FindOSI.cmake b/cmake/FindOSI.cmake
similarity index 100%
rename from CoMISo/cmake/FindOSI.cmake
rename to cmake/FindOSI.cmake
diff --git a/CoMISo/cmake/FindPETSC.cmake b/cmake/FindPETSC.cmake
similarity index 100%
rename from CoMISo/cmake/FindPETSC.cmake
rename to cmake/FindPETSC.cmake
diff --git a/CoMISo/cmake/FindPackageHandleStandardArgs.cmake b/cmake/FindPackageHandleStandardArgs.cmake
similarity index 100%
rename from CoMISo/cmake/FindPackageHandleStandardArgs.cmake
rename to cmake/FindPackageHandleStandardArgs.cmake
diff --git a/CoMISo/cmake/FindPackageMultipass.cmake b/cmake/FindPackageMultipass.cmake
similarity index 100%
rename from CoMISo/cmake/FindPackageMultipass.cmake
rename to cmake/FindPackageMultipass.cmake
diff --git a/CoMISo/cmake/FindQt4.cmake b/cmake/FindQt4.cmake
similarity index 100%
rename from CoMISo/cmake/FindQt4.cmake
rename to cmake/FindQt4.cmake
diff --git a/CoMISo/cmake/FindSUITESPARSE.cmake b/cmake/FindSUITESPARSE.cmake
similarity index 100%
rename from CoMISo/cmake/FindSUITESPARSE.cmake
rename to cmake/FindSUITESPARSE.cmake
diff --git a/CoMISo/cmake/FindTAO.cmake b/cmake/FindTAO.cmake
similarity index 100%
rename from CoMISo/cmake/FindTAO.cmake
rename to cmake/FindTAO.cmake
diff --git a/CoMISo/cmake/FindTaucs.cmake b/cmake/FindTaucs.cmake
similarity index 100%
rename from CoMISo/cmake/FindTaucs.cmake
rename to cmake/FindTaucs.cmake
diff --git a/CoMISo/cmake/ResolveCompilerPaths.cmake b/cmake/ResolveCompilerPaths.cmake
similarity index 100%
rename from CoMISo/cmake/ResolveCompilerPaths.cmake
rename to cmake/ResolveCompilerPaths.cmake