diff --git a/trunk2/core/plugins/boxes/CMakeLists.txt b/trunk2/core/plugins/algorithms/CMakeLists.txt similarity index 100% rename from trunk2/core/plugins/boxes/CMakeLists.txt rename to trunk2/core/plugins/algorithms/CMakeLists.txt diff --git a/trunk2/core/plugins/boxes/acquisition/CMakeLists.txt b/trunk2/core/plugins/algorithms/acquisition/CMakeLists.txt similarity index 100% rename from trunk2/core/plugins/boxes/acquisition/CMakeLists.txt rename to trunk2/core/plugins/algorithms/acquisition/CMakeLists.txt diff --git a/trunk2/core/plugins/boxes/acquisition/doc/BoxAlgorithm_GenericNetworkAcquisition.dox-part b/trunk2/core/plugins/algorithms/acquisition/doc/BoxAlgorithm_GenericNetworkAcquisition.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/acquisition/doc/BoxAlgorithm_GenericNetworkAcquisition.dox-part rename to trunk2/core/plugins/algorithms/acquisition/doc/BoxAlgorithm_GenericNetworkAcquisition.dox-part diff --git a/trunk2/core/plugins/boxes/acquisition/doc/Doc_BoxAlgorithm_AcquisitionClient.dox-part b/trunk2/core/plugins/algorithms/acquisition/doc/Doc_BoxAlgorithm_AcquisitionClient.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/acquisition/doc/Doc_BoxAlgorithm_AcquisitionClient.dox-part rename to trunk2/core/plugins/algorithms/acquisition/doc/Doc_BoxAlgorithm_AcquisitionClient.dox-part diff --git a/trunk2/core/plugins/boxes/acquisition/doc/Doc_BoxAlgorithm_GenericNetworkAcquisition.dox-part b/trunk2/core/plugins/algorithms/acquisition/doc/Doc_BoxAlgorithm_GenericNetworkAcquisition.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/acquisition/doc/Doc_BoxAlgorithm_GenericNetworkAcquisition.dox-part rename to trunk2/core/plugins/algorithms/acquisition/doc/Doc_BoxAlgorithm_GenericNetworkAcquisition.dox-part diff --git a/trunk2/core/plugins/boxes/acquisition/doc/genericnetworkacquisition.png b/trunk2/core/plugins/algorithms/acquisition/doc/genericnetworkacquisition.png similarity index 100% rename from trunk2/core/plugins/boxes/acquisition/doc/genericnetworkacquisition.png rename to trunk2/core/plugins/algorithms/acquisition/doc/genericnetworkacquisition.png diff --git a/trunk2/core/plugins/boxes/acquisition/src/box-algorithms/ovpCBoxAlgorithmAcquisitionClient.cpp b/trunk2/core/plugins/algorithms/acquisition/src/box-algorithms/ovpCBoxAlgorithmAcquisitionClient.cpp similarity index 100% rename from trunk2/core/plugins/boxes/acquisition/src/box-algorithms/ovpCBoxAlgorithmAcquisitionClient.cpp rename to trunk2/core/plugins/algorithms/acquisition/src/box-algorithms/ovpCBoxAlgorithmAcquisitionClient.cpp diff --git a/trunk2/core/plugins/boxes/acquisition/src/box-algorithms/ovpCBoxAlgorithmAcquisitionClient.h b/trunk2/core/plugins/algorithms/acquisition/src/box-algorithms/ovpCBoxAlgorithmAcquisitionClient.h similarity index 100% rename from trunk2/core/plugins/boxes/acquisition/src/box-algorithms/ovpCBoxAlgorithmAcquisitionClient.h rename to trunk2/core/plugins/algorithms/acquisition/src/box-algorithms/ovpCBoxAlgorithmAcquisitionClient.h diff --git a/trunk2/core/plugins/boxes/acquisition/src/box-algorithms/ovpCGenericNetworkAcquisition.cpp b/trunk2/core/plugins/algorithms/acquisition/src/box-algorithms/ovpCGenericNetworkAcquisition.cpp similarity index 100% rename from trunk2/core/plugins/boxes/acquisition/src/box-algorithms/ovpCGenericNetworkAcquisition.cpp rename to trunk2/core/plugins/algorithms/acquisition/src/box-algorithms/ovpCGenericNetworkAcquisition.cpp diff --git a/trunk2/core/plugins/boxes/acquisition/src/box-algorithms/ovpCGenericNetworkAcquisition.h b/trunk2/core/plugins/algorithms/acquisition/src/box-algorithms/ovpCGenericNetworkAcquisition.h similarity index 100% rename from trunk2/core/plugins/boxes/acquisition/src/box-algorithms/ovpCGenericNetworkAcquisition.h rename to trunk2/core/plugins/algorithms/acquisition/src/box-algorithms/ovpCGenericNetworkAcquisition.h diff --git a/trunk2/core/plugins/boxes/acquisition/src/ovp_defines.h b/trunk2/core/plugins/algorithms/acquisition/src/ovp_defines.h similarity index 100% rename from trunk2/core/plugins/boxes/acquisition/src/ovp_defines.h rename to trunk2/core/plugins/algorithms/acquisition/src/ovp_defines.h diff --git a/trunk2/core/plugins/boxes/acquisition/src/ovp_main.cpp b/trunk2/core/plugins/algorithms/acquisition/src/ovp_main.cpp similarity index 100% rename from trunk2/core/plugins/boxes/acquisition/src/ovp_main.cpp rename to trunk2/core/plugins/algorithms/acquisition/src/ovp_main.cpp diff --git a/trunk2/core/plugins/boxes/classification-gpl/CMakeLists.txt b/trunk2/core/plugins/algorithms/classification-gpl/CMakeLists.txt similarity index 100% rename from trunk2/core/plugins/boxes/classification-gpl/CMakeLists.txt rename to trunk2/core/plugins/algorithms/classification-gpl/CMakeLists.txt diff --git a/trunk2/core/plugins/boxes/classification-gpl/src/algorithms/ovpCAlgorithmClassifierBliffCFIS.cpp b/trunk2/core/plugins/algorithms/classification-gpl/src/algorithms/ovpCAlgorithmClassifierBliffCFIS.cpp similarity index 100% rename from trunk2/core/plugins/boxes/classification-gpl/src/algorithms/ovpCAlgorithmClassifierBliffCFIS.cpp rename to trunk2/core/plugins/algorithms/classification-gpl/src/algorithms/ovpCAlgorithmClassifierBliffCFIS.cpp diff --git a/trunk2/core/plugins/boxes/classification-gpl/src/algorithms/ovpCAlgorithmClassifierBliffCFIS.h b/trunk2/core/plugins/algorithms/classification-gpl/src/algorithms/ovpCAlgorithmClassifierBliffCFIS.h similarity index 100% rename from trunk2/core/plugins/boxes/classification-gpl/src/algorithms/ovpCAlgorithmClassifierBliffCFIS.h rename to trunk2/core/plugins/algorithms/classification-gpl/src/algorithms/ovpCAlgorithmClassifierBliffCFIS.h diff --git a/trunk2/core/plugins/boxes/classification-gpl/src/algorithms/ovpCAlgorithmClassifierBliffLDA.cpp b/trunk2/core/plugins/algorithms/classification-gpl/src/algorithms/ovpCAlgorithmClassifierBliffLDA.cpp similarity index 100% rename from trunk2/core/plugins/boxes/classification-gpl/src/algorithms/ovpCAlgorithmClassifierBliffLDA.cpp rename to trunk2/core/plugins/algorithms/classification-gpl/src/algorithms/ovpCAlgorithmClassifierBliffLDA.cpp diff --git a/trunk2/core/plugins/boxes/classification-gpl/src/algorithms/ovpCAlgorithmClassifierBliffLDA.h b/trunk2/core/plugins/algorithms/classification-gpl/src/algorithms/ovpCAlgorithmClassifierBliffLDA.h similarity index 100% rename from trunk2/core/plugins/boxes/classification-gpl/src/algorithms/ovpCAlgorithmClassifierBliffLDA.h rename to trunk2/core/plugins/algorithms/classification-gpl/src/algorithms/ovpCAlgorithmClassifierBliffLDA.h diff --git a/trunk2/core/plugins/boxes/classification-gpl/src/algorithms/ovpCAlgorithmClassifierLDA.cpp b/trunk2/core/plugins/algorithms/classification-gpl/src/algorithms/ovpCAlgorithmClassifierLDA.cpp similarity index 100% rename from trunk2/core/plugins/boxes/classification-gpl/src/algorithms/ovpCAlgorithmClassifierLDA.cpp rename to trunk2/core/plugins/algorithms/classification-gpl/src/algorithms/ovpCAlgorithmClassifierLDA.cpp diff --git a/trunk2/core/plugins/boxes/classification-gpl/src/algorithms/ovpCAlgorithmClassifierLDA.h b/trunk2/core/plugins/algorithms/classification-gpl/src/algorithms/ovpCAlgorithmClassifierLDA.h similarity index 100% rename from trunk2/core/plugins/boxes/classification-gpl/src/algorithms/ovpCAlgorithmClassifierLDA.h rename to trunk2/core/plugins/algorithms/classification-gpl/src/algorithms/ovpCAlgorithmClassifierLDA.h diff --git a/trunk2/core/plugins/boxes/classification-gpl/src/ovp_defines.h b/trunk2/core/plugins/algorithms/classification-gpl/src/ovp_defines.h similarity index 100% rename from trunk2/core/plugins/boxes/classification-gpl/src/ovp_defines.h rename to trunk2/core/plugins/algorithms/classification-gpl/src/ovp_defines.h diff --git a/trunk2/core/plugins/boxes/classification-gpl/src/ovp_main.cpp b/trunk2/core/plugins/algorithms/classification-gpl/src/ovp_main.cpp similarity index 100% rename from trunk2/core/plugins/boxes/classification-gpl/src/ovp_main.cpp rename to trunk2/core/plugins/algorithms/classification-gpl/src/ovp_main.cpp diff --git a/trunk2/core/plugins/boxes/classification/CMakeLists.txt b/trunk2/core/plugins/algorithms/classification/CMakeLists.txt similarity index 100% rename from trunk2/core/plugins/boxes/classification/CMakeLists.txt rename to trunk2/core/plugins/algorithms/classification/CMakeLists.txt diff --git a/trunk2/core/plugins/boxes/classification/doc/Doc_BoxAlgorithm_ClassifierProcessor.dox-part b/trunk2/core/plugins/algorithms/classification/doc/Doc_BoxAlgorithm_ClassifierProcessor.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/classification/doc/Doc_BoxAlgorithm_ClassifierProcessor.dox-part rename to trunk2/core/plugins/algorithms/classification/doc/Doc_BoxAlgorithm_ClassifierProcessor.dox-part diff --git a/trunk2/core/plugins/boxes/classification/doc/Doc_BoxAlgorithm_ClassifierTrainer.dox-part b/trunk2/core/plugins/algorithms/classification/doc/Doc_BoxAlgorithm_ClassifierTrainer.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/classification/doc/Doc_BoxAlgorithm_ClassifierTrainer.dox-part rename to trunk2/core/plugins/algorithms/classification/doc/Doc_BoxAlgorithm_ClassifierTrainer.dox-part diff --git a/trunk2/core/plugins/boxes/classification/doc/Doc_BoxAlgorithm_ConfusionMatrix.dox-part b/trunk2/core/plugins/algorithms/classification/doc/Doc_BoxAlgorithm_ConfusionMatrix.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/classification/doc/Doc_BoxAlgorithm_ConfusionMatrix.dox-part rename to trunk2/core/plugins/algorithms/classification/doc/Doc_BoxAlgorithm_ConfusionMatrix.dox-part diff --git a/trunk2/core/plugins/boxes/classification/doc/Doc_BoxAlgorithm_VotingClassifier.dox-part b/trunk2/core/plugins/algorithms/classification/doc/Doc_BoxAlgorithm_VotingClassifier.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/classification/doc/Doc_BoxAlgorithm_VotingClassifier.dox-part rename to trunk2/core/plugins/algorithms/classification/doc/Doc_BoxAlgorithm_VotingClassifier.dox-part diff --git a/trunk2/core/plugins/boxes/classification/doc/ovpCLDAClassifier.dox b/trunk2/core/plugins/algorithms/classification/doc/ovpCLDAClassifier.dox similarity index 100% rename from trunk2/core/plugins/boxes/classification/doc/ovpCLDAClassifier.dox rename to trunk2/core/plugins/algorithms/classification/doc/ovpCLDAClassifier.dox diff --git a/trunk2/core/plugins/boxes/classification/src/algorithms/libSVM/svm.cpp b/trunk2/core/plugins/algorithms/classification/src/algorithms/libSVM/svm.cpp similarity index 100% rename from trunk2/core/plugins/boxes/classification/src/algorithms/libSVM/svm.cpp rename to trunk2/core/plugins/algorithms/classification/src/algorithms/libSVM/svm.cpp diff --git a/trunk2/core/plugins/boxes/classification/src/algorithms/libSVM/svm.h b/trunk2/core/plugins/algorithms/classification/src/algorithms/libSVM/svm.h similarity index 100% rename from trunk2/core/plugins/boxes/classification/src/algorithms/libSVM/svm.h rename to trunk2/core/plugins/algorithms/classification/src/algorithms/libSVM/svm.h diff --git a/trunk2/core/plugins/boxes/classification/src/algorithms/ovpCAlgorithmClassifierNULL.cpp b/trunk2/core/plugins/algorithms/classification/src/algorithms/ovpCAlgorithmClassifierNULL.cpp similarity index 100% rename from trunk2/core/plugins/boxes/classification/src/algorithms/ovpCAlgorithmClassifierNULL.cpp rename to trunk2/core/plugins/algorithms/classification/src/algorithms/ovpCAlgorithmClassifierNULL.cpp diff --git a/trunk2/core/plugins/boxes/classification/src/algorithms/ovpCAlgorithmClassifierNULL.h b/trunk2/core/plugins/algorithms/classification/src/algorithms/ovpCAlgorithmClassifierNULL.h similarity index 100% rename from trunk2/core/plugins/boxes/classification/src/algorithms/ovpCAlgorithmClassifierNULL.h rename to trunk2/core/plugins/algorithms/classification/src/algorithms/ovpCAlgorithmClassifierNULL.h diff --git a/trunk2/core/plugins/boxes/classification/src/algorithms/ovpCAlgorithmClassifierSVM.cpp b/trunk2/core/plugins/algorithms/classification/src/algorithms/ovpCAlgorithmClassifierSVM.cpp similarity index 100% rename from trunk2/core/plugins/boxes/classification/src/algorithms/ovpCAlgorithmClassifierSVM.cpp rename to trunk2/core/plugins/algorithms/classification/src/algorithms/ovpCAlgorithmClassifierSVM.cpp diff --git a/trunk2/core/plugins/boxes/classification/src/algorithms/ovpCAlgorithmClassifierSVM.h b/trunk2/core/plugins/algorithms/classification/src/algorithms/ovpCAlgorithmClassifierSVM.h similarity index 100% rename from trunk2/core/plugins/boxes/classification/src/algorithms/ovpCAlgorithmClassifierSVM.h rename to trunk2/core/plugins/algorithms/classification/src/algorithms/ovpCAlgorithmClassifierSVM.h diff --git a/trunk2/core/plugins/boxes/classification/src/algorithms/ovpCAlgorithmConfusionMatrix.cpp b/trunk2/core/plugins/algorithms/classification/src/algorithms/ovpCAlgorithmConfusionMatrix.cpp similarity index 100% rename from trunk2/core/plugins/boxes/classification/src/algorithms/ovpCAlgorithmConfusionMatrix.cpp rename to trunk2/core/plugins/algorithms/classification/src/algorithms/ovpCAlgorithmConfusionMatrix.cpp diff --git a/trunk2/core/plugins/boxes/classification/src/algorithms/ovpCAlgorithmConfusionMatrix.h b/trunk2/core/plugins/algorithms/classification/src/algorithms/ovpCAlgorithmConfusionMatrix.h similarity index 100% rename from trunk2/core/plugins/boxes/classification/src/algorithms/ovpCAlgorithmConfusionMatrix.h rename to trunk2/core/plugins/algorithms/classification/src/algorithms/ovpCAlgorithmConfusionMatrix.h diff --git a/trunk2/core/plugins/boxes/classification/src/box-algorithms/ovpCBoxAlgorithmClassifierProcessor.cpp b/trunk2/core/plugins/algorithms/classification/src/box-algorithms/ovpCBoxAlgorithmClassifierProcessor.cpp similarity index 100% rename from trunk2/core/plugins/boxes/classification/src/box-algorithms/ovpCBoxAlgorithmClassifierProcessor.cpp rename to trunk2/core/plugins/algorithms/classification/src/box-algorithms/ovpCBoxAlgorithmClassifierProcessor.cpp diff --git a/trunk2/core/plugins/boxes/classification/src/box-algorithms/ovpCBoxAlgorithmClassifierProcessor.h b/trunk2/core/plugins/algorithms/classification/src/box-algorithms/ovpCBoxAlgorithmClassifierProcessor.h similarity index 100% rename from trunk2/core/plugins/boxes/classification/src/box-algorithms/ovpCBoxAlgorithmClassifierProcessor.h rename to trunk2/core/plugins/algorithms/classification/src/box-algorithms/ovpCBoxAlgorithmClassifierProcessor.h diff --git a/trunk2/core/plugins/boxes/classification/src/box-algorithms/ovpCBoxAlgorithmClassifierTrainer.cpp b/trunk2/core/plugins/algorithms/classification/src/box-algorithms/ovpCBoxAlgorithmClassifierTrainer.cpp similarity index 100% rename from trunk2/core/plugins/boxes/classification/src/box-algorithms/ovpCBoxAlgorithmClassifierTrainer.cpp rename to trunk2/core/plugins/algorithms/classification/src/box-algorithms/ovpCBoxAlgorithmClassifierTrainer.cpp diff --git a/trunk2/core/plugins/boxes/classification/src/box-algorithms/ovpCBoxAlgorithmClassifierTrainer.h b/trunk2/core/plugins/algorithms/classification/src/box-algorithms/ovpCBoxAlgorithmClassifierTrainer.h similarity index 100% rename from trunk2/core/plugins/boxes/classification/src/box-algorithms/ovpCBoxAlgorithmClassifierTrainer.h rename to trunk2/core/plugins/algorithms/classification/src/box-algorithms/ovpCBoxAlgorithmClassifierTrainer.h diff --git a/trunk2/core/plugins/boxes/classification/src/box-algorithms/ovpCBoxAlgorithmCommonClassifierListener.inl b/trunk2/core/plugins/algorithms/classification/src/box-algorithms/ovpCBoxAlgorithmCommonClassifierListener.inl similarity index 100% rename from trunk2/core/plugins/boxes/classification/src/box-algorithms/ovpCBoxAlgorithmCommonClassifierListener.inl rename to trunk2/core/plugins/algorithms/classification/src/box-algorithms/ovpCBoxAlgorithmCommonClassifierListener.inl diff --git a/trunk2/core/plugins/boxes/classification/src/box-algorithms/ovpCBoxAlgorithmConfusionMatrix.cpp b/trunk2/core/plugins/algorithms/classification/src/box-algorithms/ovpCBoxAlgorithmConfusionMatrix.cpp similarity index 100% rename from trunk2/core/plugins/boxes/classification/src/box-algorithms/ovpCBoxAlgorithmConfusionMatrix.cpp rename to trunk2/core/plugins/algorithms/classification/src/box-algorithms/ovpCBoxAlgorithmConfusionMatrix.cpp diff --git a/trunk2/core/plugins/boxes/classification/src/box-algorithms/ovpCBoxAlgorithmConfusionMatrix.h b/trunk2/core/plugins/algorithms/classification/src/box-algorithms/ovpCBoxAlgorithmConfusionMatrix.h similarity index 100% rename from trunk2/core/plugins/boxes/classification/src/box-algorithms/ovpCBoxAlgorithmConfusionMatrix.h rename to trunk2/core/plugins/algorithms/classification/src/box-algorithms/ovpCBoxAlgorithmConfusionMatrix.h diff --git a/trunk2/core/plugins/boxes/classification/src/box-algorithms/ovpCBoxAlgorithmVotingClassifier.cpp b/trunk2/core/plugins/algorithms/classification/src/box-algorithms/ovpCBoxAlgorithmVotingClassifier.cpp similarity index 100% rename from trunk2/core/plugins/boxes/classification/src/box-algorithms/ovpCBoxAlgorithmVotingClassifier.cpp rename to trunk2/core/plugins/algorithms/classification/src/box-algorithms/ovpCBoxAlgorithmVotingClassifier.cpp diff --git a/trunk2/core/plugins/boxes/classification/src/box-algorithms/ovpCBoxAlgorithmVotingClassifier.h b/trunk2/core/plugins/algorithms/classification/src/box-algorithms/ovpCBoxAlgorithmVotingClassifier.h similarity index 100% rename from trunk2/core/plugins/boxes/classification/src/box-algorithms/ovpCBoxAlgorithmVotingClassifier.h rename to trunk2/core/plugins/algorithms/classification/src/box-algorithms/ovpCBoxAlgorithmVotingClassifier.h diff --git a/trunk2/core/plugins/boxes/classification/src/box-algorithms/ovpCLDAClassifier.cpp b/trunk2/core/plugins/algorithms/classification/src/box-algorithms/ovpCLDAClassifier.cpp similarity index 100% rename from trunk2/core/plugins/boxes/classification/src/box-algorithms/ovpCLDAClassifier.cpp rename to trunk2/core/plugins/algorithms/classification/src/box-algorithms/ovpCLDAClassifier.cpp diff --git a/trunk2/core/plugins/boxes/classification/src/box-algorithms/ovpCLDAClassifier.h b/trunk2/core/plugins/algorithms/classification/src/box-algorithms/ovpCLDAClassifier.h similarity index 100% rename from trunk2/core/plugins/boxes/classification/src/box-algorithms/ovpCLDAClassifier.h rename to trunk2/core/plugins/algorithms/classification/src/box-algorithms/ovpCLDAClassifier.h diff --git a/trunk2/core/plugins/boxes/classification/src/ovp_defines.h b/trunk2/core/plugins/algorithms/classification/src/ovp_defines.h similarity index 100% rename from trunk2/core/plugins/boxes/classification/src/ovp_defines.h rename to trunk2/core/plugins/algorithms/classification/src/ovp_defines.h diff --git a/trunk2/core/plugins/boxes/classification/src/ovp_main.cpp b/trunk2/core/plugins/algorithms/classification/src/ovp_main.cpp similarity index 100% rename from trunk2/core/plugins/boxes/classification/src/ovp_main.cpp rename to trunk2/core/plugins/algorithms/classification/src/ovp_main.cpp diff --git a/trunk2/core/plugins/boxes/examples/CMakeLists.txt b/trunk2/core/plugins/algorithms/examples/CMakeLists.txt similarity index 100% rename from trunk2/core/plugins/boxes/examples/CMakeLists.txt rename to trunk2/core/plugins/algorithms/examples/CMakeLists.txt diff --git a/trunk2/core/plugins/boxes/examples/src/box-algorithms/ovpCHelloWorld.cpp b/trunk2/core/plugins/algorithms/examples/src/box-algorithms/ovpCHelloWorld.cpp similarity index 100% rename from trunk2/core/plugins/boxes/examples/src/box-algorithms/ovpCHelloWorld.cpp rename to trunk2/core/plugins/algorithms/examples/src/box-algorithms/ovpCHelloWorld.cpp diff --git a/trunk2/core/plugins/boxes/examples/src/box-algorithms/ovpCHelloWorld.h b/trunk2/core/plugins/algorithms/examples/src/box-algorithms/ovpCHelloWorld.h similarity index 100% rename from trunk2/core/plugins/boxes/examples/src/box-algorithms/ovpCHelloWorld.h rename to trunk2/core/plugins/algorithms/examples/src/box-algorithms/ovpCHelloWorld.h diff --git a/trunk2/core/plugins/boxes/examples/src/box-algorithms/ovpCHelloWorldWithInput.cpp b/trunk2/core/plugins/algorithms/examples/src/box-algorithms/ovpCHelloWorldWithInput.cpp similarity index 100% rename from trunk2/core/plugins/boxes/examples/src/box-algorithms/ovpCHelloWorldWithInput.cpp rename to trunk2/core/plugins/algorithms/examples/src/box-algorithms/ovpCHelloWorldWithInput.cpp diff --git a/trunk2/core/plugins/boxes/examples/src/box-algorithms/ovpCHelloWorldWithInput.h b/trunk2/core/plugins/algorithms/examples/src/box-algorithms/ovpCHelloWorldWithInput.h similarity index 100% rename from trunk2/core/plugins/boxes/examples/src/box-algorithms/ovpCHelloWorldWithInput.h rename to trunk2/core/plugins/algorithms/examples/src/box-algorithms/ovpCHelloWorldWithInput.h diff --git a/trunk2/core/plugins/boxes/examples/src/ovp_defines.h b/trunk2/core/plugins/algorithms/examples/src/ovp_defines.h similarity index 100% rename from trunk2/core/plugins/boxes/examples/src/ovp_defines.h rename to trunk2/core/plugins/algorithms/examples/src/ovp_defines.h diff --git a/trunk2/core/plugins/boxes/examples/src/ovp_main.cpp b/trunk2/core/plugins/algorithms/examples/src/ovp_main.cpp similarity index 100% rename from trunk2/core/plugins/boxes/examples/src/ovp_main.cpp rename to trunk2/core/plugins/algorithms/examples/src/ovp_main.cpp diff --git a/trunk2/core/plugins/boxes/feature-extraction/CMakeLists.txt b/trunk2/core/plugins/algorithms/feature-extraction/CMakeLists.txt similarity index 100% rename from trunk2/core/plugins/boxes/feature-extraction/CMakeLists.txt rename to trunk2/core/plugins/algorithms/feature-extraction/CMakeLists.txt diff --git a/trunk2/core/plugins/boxes/feature-extraction/doc/Doc_BoxAlgorithm_FeatureAggregator.dox-part b/trunk2/core/plugins/algorithms/feature-extraction/doc/Doc_BoxAlgorithm_FeatureAggregator.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/feature-extraction/doc/Doc_BoxAlgorithm_FeatureAggregator.dox-part rename to trunk2/core/plugins/algorithms/feature-extraction/doc/Doc_BoxAlgorithm_FeatureAggregator.dox-part diff --git a/trunk2/core/plugins/boxes/feature-extraction/src/box-algorithms/ovpCFeatureAggregator.cpp b/trunk2/core/plugins/algorithms/feature-extraction/src/box-algorithms/ovpCFeatureAggregator.cpp similarity index 100% rename from trunk2/core/plugins/boxes/feature-extraction/src/box-algorithms/ovpCFeatureAggregator.cpp rename to trunk2/core/plugins/algorithms/feature-extraction/src/box-algorithms/ovpCFeatureAggregator.cpp diff --git a/trunk2/core/plugins/boxes/feature-extraction/src/box-algorithms/ovpCFeatureAggregator.h b/trunk2/core/plugins/algorithms/feature-extraction/src/box-algorithms/ovpCFeatureAggregator.h similarity index 100% rename from trunk2/core/plugins/boxes/feature-extraction/src/box-algorithms/ovpCFeatureAggregator.h rename to trunk2/core/plugins/algorithms/feature-extraction/src/box-algorithms/ovpCFeatureAggregator.h diff --git a/trunk2/core/plugins/boxes/feature-extraction/src/ovp_defines.h b/trunk2/core/plugins/algorithms/feature-extraction/src/ovp_defines.h similarity index 100% rename from trunk2/core/plugins/boxes/feature-extraction/src/ovp_defines.h rename to trunk2/core/plugins/algorithms/feature-extraction/src/ovp_defines.h diff --git a/trunk2/core/plugins/boxes/feature-extraction/src/ovp_main.cpp b/trunk2/core/plugins/algorithms/feature-extraction/src/ovp_main.cpp similarity index 100% rename from trunk2/core/plugins/boxes/feature-extraction/src/ovp_main.cpp rename to trunk2/core/plugins/algorithms/feature-extraction/src/ovp_main.cpp diff --git a/trunk2/core/plugins/boxes/file-io/CMakeLists.txt b/trunk2/core/plugins/algorithms/file-io/CMakeLists.txt similarity index 100% rename from trunk2/core/plugins/boxes/file-io/CMakeLists.txt rename to trunk2/core/plugins/algorithms/file-io/CMakeLists.txt diff --git a/trunk2/core/plugins/boxes/file-io/doc/Doc_BoxAlgorithm_BCI2000FileReader.dox-part b/trunk2/core/plugins/algorithms/file-io/doc/Doc_BoxAlgorithm_BCI2000FileReader.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/file-io/doc/Doc_BoxAlgorithm_BCI2000FileReader.dox-part rename to trunk2/core/plugins/algorithms/file-io/doc/Doc_BoxAlgorithm_BCI2000FileReader.dox-part diff --git a/trunk2/core/plugins/boxes/file-io/doc/Doc_BoxAlgorithm_BCICompetitionIIIbReader.dox-part b/trunk2/core/plugins/algorithms/file-io/doc/Doc_BoxAlgorithm_BCICompetitionIIIbReader.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/file-io/doc/Doc_BoxAlgorithm_BCICompetitionIIIbReader.dox-part rename to trunk2/core/plugins/algorithms/file-io/doc/Doc_BoxAlgorithm_BCICompetitionIIIbReader.dox-part diff --git a/trunk2/core/plugins/boxes/file-io/doc/Doc_BoxAlgorithm_BrainampFileReader.dox-part b/trunk2/core/plugins/algorithms/file-io/doc/Doc_BoxAlgorithm_BrainampFileReader.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/file-io/doc/Doc_BoxAlgorithm_BrainampFileReader.dox-part rename to trunk2/core/plugins/algorithms/file-io/doc/Doc_BoxAlgorithm_BrainampFileReader.dox-part diff --git a/trunk2/core/plugins/boxes/file-io/doc/Doc_BoxAlgorithm_CSVFileReader.dox-part b/trunk2/core/plugins/algorithms/file-io/doc/Doc_BoxAlgorithm_CSVFileReader.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/file-io/doc/Doc_BoxAlgorithm_CSVFileReader.dox-part rename to trunk2/core/plugins/algorithms/file-io/doc/Doc_BoxAlgorithm_CSVFileReader.dox-part diff --git a/trunk2/core/plugins/boxes/file-io/doc/Doc_BoxAlgorithm_CSVFileWriter.dox-part b/trunk2/core/plugins/algorithms/file-io/doc/Doc_BoxAlgorithm_CSVFileWriter.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/file-io/doc/Doc_BoxAlgorithm_CSVFileWriter.dox-part rename to trunk2/core/plugins/algorithms/file-io/doc/Doc_BoxAlgorithm_CSVFileWriter.dox-part diff --git a/trunk2/core/plugins/boxes/file-io/doc/Doc_BoxAlgorithm_EDFFileWriter.dox-part b/trunk2/core/plugins/algorithms/file-io/doc/Doc_BoxAlgorithm_EDFFileWriter.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/file-io/doc/Doc_BoxAlgorithm_EDFFileWriter.dox-part rename to trunk2/core/plugins/algorithms/file-io/doc/Doc_BoxAlgorithm_EDFFileWriter.dox-part diff --git a/trunk2/core/plugins/boxes/file-io/doc/Doc_BoxAlgorithm_ElectrodeLocalisationFileReader.dox-part b/trunk2/core/plugins/algorithms/file-io/doc/Doc_BoxAlgorithm_ElectrodeLocalisationFileReader.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/file-io/doc/Doc_BoxAlgorithm_ElectrodeLocalisationFileReader.dox-part rename to trunk2/core/plugins/algorithms/file-io/doc/Doc_BoxAlgorithm_ElectrodeLocalisationFileReader.dox-part diff --git a/trunk2/core/plugins/boxes/file-io/doc/Doc_BoxAlgorithm_GDFFileReader.dox-part b/trunk2/core/plugins/algorithms/file-io/doc/Doc_BoxAlgorithm_GDFFileReader.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/file-io/doc/Doc_BoxAlgorithm_GDFFileReader.dox-part rename to trunk2/core/plugins/algorithms/file-io/doc/Doc_BoxAlgorithm_GDFFileReader.dox-part diff --git a/trunk2/core/plugins/boxes/file-io/doc/Doc_BoxAlgorithm_GDFFileWriter.dox-part b/trunk2/core/plugins/algorithms/file-io/doc/Doc_BoxAlgorithm_GDFFileWriter.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/file-io/doc/Doc_BoxAlgorithm_GDFFileWriter.dox-part rename to trunk2/core/plugins/algorithms/file-io/doc/Doc_BoxAlgorithm_GDFFileWriter.dox-part diff --git a/trunk2/core/plugins/boxes/file-io/doc/Doc_BoxAlgorithm_GenericStreamReader.dox-part b/trunk2/core/plugins/algorithms/file-io/doc/Doc_BoxAlgorithm_GenericStreamReader.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/file-io/doc/Doc_BoxAlgorithm_GenericStreamReader.dox-part rename to trunk2/core/plugins/algorithms/file-io/doc/Doc_BoxAlgorithm_GenericStreamReader.dox-part diff --git a/trunk2/core/plugins/boxes/file-io/doc/Doc_BoxAlgorithm_GenericStreamWriter.dox-part b/trunk2/core/plugins/algorithms/file-io/doc/Doc_BoxAlgorithm_GenericStreamWriter.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/file-io/doc/Doc_BoxAlgorithm_GenericStreamWriter.dox-part rename to trunk2/core/plugins/algorithms/file-io/doc/Doc_BoxAlgorithm_GenericStreamWriter.dox-part diff --git a/trunk2/core/plugins/boxes/file-io/doc/Doc_BoxAlgorithm_SignalConcatenation.dox-part b/trunk2/core/plugins/algorithms/file-io/doc/Doc_BoxAlgorithm_SignalConcatenation.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/file-io/doc/Doc_BoxAlgorithm_SignalConcatenation.dox-part rename to trunk2/core/plugins/algorithms/file-io/doc/Doc_BoxAlgorithm_SignalConcatenation.dox-part diff --git a/trunk2/core/plugins/boxes/file-io/share/electrode_sets/electrode_set_standard_cartesian.txt b/trunk2/core/plugins/algorithms/file-io/share/electrode_sets/electrode_set_standard_cartesian.txt similarity index 100% rename from trunk2/core/plugins/boxes/file-io/share/electrode_sets/electrode_set_standard_cartesian.txt rename to trunk2/core/plugins/algorithms/file-io/share/electrode_sets/electrode_set_standard_cartesian.txt diff --git a/trunk2/core/plugins/boxes/file-io/share/electrode_sets/electrode_set_standard_spherical.txt b/trunk2/core/plugins/algorithms/file-io/share/electrode_sets/electrode_set_standard_spherical.txt similarity index 100% rename from trunk2/core/plugins/boxes/file-io/share/electrode_sets/electrode_set_standard_spherical.txt rename to trunk2/core/plugins/algorithms/file-io/share/electrode_sets/electrode_set_standard_spherical.txt diff --git a/trunk2/core/plugins/boxes/file-io/src/algorithms/brainamp/ovpCAlgorithmBrainampFileReader.cpp b/trunk2/core/plugins/algorithms/file-io/src/algorithms/brainamp/ovpCAlgorithmBrainampFileReader.cpp similarity index 100% rename from trunk2/core/plugins/boxes/file-io/src/algorithms/brainamp/ovpCAlgorithmBrainampFileReader.cpp rename to trunk2/core/plugins/algorithms/file-io/src/algorithms/brainamp/ovpCAlgorithmBrainampFileReader.cpp diff --git a/trunk2/core/plugins/boxes/file-io/src/algorithms/brainamp/ovpCAlgorithmBrainampFileReader.h b/trunk2/core/plugins/algorithms/file-io/src/algorithms/brainamp/ovpCAlgorithmBrainampFileReader.h similarity index 100% rename from trunk2/core/plugins/boxes/file-io/src/algorithms/brainamp/ovpCAlgorithmBrainampFileReader.h rename to trunk2/core/plugins/algorithms/file-io/src/algorithms/brainamp/ovpCAlgorithmBrainampFileReader.h diff --git a/trunk2/core/plugins/boxes/file-io/src/algorithms/ovpCAlgorithmOVMatrixFileReader.cpp b/trunk2/core/plugins/algorithms/file-io/src/algorithms/ovpCAlgorithmOVMatrixFileReader.cpp similarity index 100% rename from trunk2/core/plugins/boxes/file-io/src/algorithms/ovpCAlgorithmOVMatrixFileReader.cpp rename to trunk2/core/plugins/algorithms/file-io/src/algorithms/ovpCAlgorithmOVMatrixFileReader.cpp diff --git a/trunk2/core/plugins/boxes/file-io/src/algorithms/ovpCAlgorithmOVMatrixFileReader.h b/trunk2/core/plugins/algorithms/file-io/src/algorithms/ovpCAlgorithmOVMatrixFileReader.h similarity index 100% rename from trunk2/core/plugins/boxes/file-io/src/algorithms/ovpCAlgorithmOVMatrixFileReader.h rename to trunk2/core/plugins/algorithms/file-io/src/algorithms/ovpCAlgorithmOVMatrixFileReader.h diff --git a/trunk2/core/plugins/boxes/file-io/src/algorithms/ovpCAlgorithmOVMatrixFileWriter.cpp b/trunk2/core/plugins/algorithms/file-io/src/algorithms/ovpCAlgorithmOVMatrixFileWriter.cpp similarity index 100% rename from trunk2/core/plugins/boxes/file-io/src/algorithms/ovpCAlgorithmOVMatrixFileWriter.cpp rename to trunk2/core/plugins/algorithms/file-io/src/algorithms/ovpCAlgorithmOVMatrixFileWriter.cpp diff --git a/trunk2/core/plugins/boxes/file-io/src/algorithms/ovpCAlgorithmOVMatrixFileWriter.h b/trunk2/core/plugins/algorithms/file-io/src/algorithms/ovpCAlgorithmOVMatrixFileWriter.h similarity index 100% rename from trunk2/core/plugins/boxes/file-io/src/algorithms/ovpCAlgorithmOVMatrixFileWriter.h rename to trunk2/core/plugins/algorithms/file-io/src/algorithms/ovpCAlgorithmOVMatrixFileWriter.h diff --git a/trunk2/core/plugins/boxes/file-io/src/algorithms/xml-scenario/ovpCAlgorithmXMLScenarioExporter.cpp b/trunk2/core/plugins/algorithms/file-io/src/algorithms/xml-scenario/ovpCAlgorithmXMLScenarioExporter.cpp similarity index 100% rename from trunk2/core/plugins/boxes/file-io/src/algorithms/xml-scenario/ovpCAlgorithmXMLScenarioExporter.cpp rename to trunk2/core/plugins/algorithms/file-io/src/algorithms/xml-scenario/ovpCAlgorithmXMLScenarioExporter.cpp diff --git a/trunk2/core/plugins/boxes/file-io/src/algorithms/xml-scenario/ovpCAlgorithmXMLScenarioExporter.h b/trunk2/core/plugins/algorithms/file-io/src/algorithms/xml-scenario/ovpCAlgorithmXMLScenarioExporter.h similarity index 100% rename from trunk2/core/plugins/boxes/file-io/src/algorithms/xml-scenario/ovpCAlgorithmXMLScenarioExporter.h rename to trunk2/core/plugins/algorithms/file-io/src/algorithms/xml-scenario/ovpCAlgorithmXMLScenarioExporter.h diff --git a/trunk2/core/plugins/boxes/file-io/src/algorithms/xml-scenario/ovpCAlgorithmXMLScenarioImporter.cpp b/trunk2/core/plugins/algorithms/file-io/src/algorithms/xml-scenario/ovpCAlgorithmXMLScenarioImporter.cpp similarity index 100% rename from trunk2/core/plugins/boxes/file-io/src/algorithms/xml-scenario/ovpCAlgorithmXMLScenarioImporter.cpp rename to trunk2/core/plugins/algorithms/file-io/src/algorithms/xml-scenario/ovpCAlgorithmXMLScenarioImporter.cpp diff --git a/trunk2/core/plugins/boxes/file-io/src/algorithms/xml-scenario/ovpCAlgorithmXMLScenarioImporter.h b/trunk2/core/plugins/algorithms/file-io/src/algorithms/xml-scenario/ovpCAlgorithmXMLScenarioImporter.h similarity index 100% rename from trunk2/core/plugins/boxes/file-io/src/algorithms/xml-scenario/ovpCAlgorithmXMLScenarioImporter.h rename to trunk2/core/plugins/algorithms/file-io/src/algorithms/xml-scenario/ovpCAlgorithmXMLScenarioImporter.h diff --git a/trunk2/core/plugins/boxes/file-io/src/box-algorithms/bci2000reader/ovpCBCI2000ReaderHelper.cpp b/trunk2/core/plugins/algorithms/file-io/src/box-algorithms/bci2000reader/ovpCBCI2000ReaderHelper.cpp similarity index 100% rename from trunk2/core/plugins/boxes/file-io/src/box-algorithms/bci2000reader/ovpCBCI2000ReaderHelper.cpp rename to trunk2/core/plugins/algorithms/file-io/src/box-algorithms/bci2000reader/ovpCBCI2000ReaderHelper.cpp diff --git a/trunk2/core/plugins/boxes/file-io/src/box-algorithms/bci2000reader/ovpCBCI2000ReaderHelper.h b/trunk2/core/plugins/algorithms/file-io/src/box-algorithms/bci2000reader/ovpCBCI2000ReaderHelper.h similarity index 100% rename from trunk2/core/plugins/boxes/file-io/src/box-algorithms/bci2000reader/ovpCBCI2000ReaderHelper.h rename to trunk2/core/plugins/algorithms/file-io/src/box-algorithms/bci2000reader/ovpCBCI2000ReaderHelper.h diff --git a/trunk2/core/plugins/boxes/file-io/src/box-algorithms/bci2000reader/ovpCBitfield.cpp b/trunk2/core/plugins/algorithms/file-io/src/box-algorithms/bci2000reader/ovpCBitfield.cpp similarity index 100% rename from trunk2/core/plugins/boxes/file-io/src/box-algorithms/bci2000reader/ovpCBitfield.cpp rename to trunk2/core/plugins/algorithms/file-io/src/box-algorithms/bci2000reader/ovpCBitfield.cpp diff --git a/trunk2/core/plugins/boxes/file-io/src/box-algorithms/bci2000reader/ovpCBitfield.h b/trunk2/core/plugins/algorithms/file-io/src/box-algorithms/bci2000reader/ovpCBitfield.h similarity index 100% rename from trunk2/core/plugins/boxes/file-io/src/box-algorithms/bci2000reader/ovpCBitfield.h rename to trunk2/core/plugins/algorithms/file-io/src/box-algorithms/bci2000reader/ovpCBitfield.h diff --git a/trunk2/core/plugins/boxes/file-io/src/box-algorithms/bci2000reader/ovpCBoxAlgorithmBCI2000Reader.cpp b/trunk2/core/plugins/algorithms/file-io/src/box-algorithms/bci2000reader/ovpCBoxAlgorithmBCI2000Reader.cpp similarity index 100% rename from trunk2/core/plugins/boxes/file-io/src/box-algorithms/bci2000reader/ovpCBoxAlgorithmBCI2000Reader.cpp rename to trunk2/core/plugins/algorithms/file-io/src/box-algorithms/bci2000reader/ovpCBoxAlgorithmBCI2000Reader.cpp diff --git a/trunk2/core/plugins/boxes/file-io/src/box-algorithms/bci2000reader/ovpCBoxAlgorithmBCI2000Reader.h b/trunk2/core/plugins/algorithms/file-io/src/box-algorithms/bci2000reader/ovpCBoxAlgorithmBCI2000Reader.h similarity index 100% rename from trunk2/core/plugins/boxes/file-io/src/box-algorithms/bci2000reader/ovpCBoxAlgorithmBCI2000Reader.h rename to trunk2/core/plugins/algorithms/file-io/src/box-algorithms/bci2000reader/ovpCBoxAlgorithmBCI2000Reader.h diff --git a/trunk2/core/plugins/boxes/file-io/src/box-algorithms/brainamp/ovpCBoxAlgorithmBrainampFileReader.cpp b/trunk2/core/plugins/algorithms/file-io/src/box-algorithms/brainamp/ovpCBoxAlgorithmBrainampFileReader.cpp similarity index 100% rename from trunk2/core/plugins/boxes/file-io/src/box-algorithms/brainamp/ovpCBoxAlgorithmBrainampFileReader.cpp rename to trunk2/core/plugins/algorithms/file-io/src/box-algorithms/brainamp/ovpCBoxAlgorithmBrainampFileReader.cpp diff --git a/trunk2/core/plugins/boxes/file-io/src/box-algorithms/brainamp/ovpCBoxAlgorithmBrainampFileReader.h b/trunk2/core/plugins/algorithms/file-io/src/box-algorithms/brainamp/ovpCBoxAlgorithmBrainampFileReader.h similarity index 100% rename from trunk2/core/plugins/boxes/file-io/src/box-algorithms/brainamp/ovpCBoxAlgorithmBrainampFileReader.h rename to trunk2/core/plugins/algorithms/file-io/src/box-algorithms/brainamp/ovpCBoxAlgorithmBrainampFileReader.h diff --git a/trunk2/core/plugins/boxes/file-io/src/box-algorithms/csv/ovpCBoxAlgorithmCSVFileReader.cpp b/trunk2/core/plugins/algorithms/file-io/src/box-algorithms/csv/ovpCBoxAlgorithmCSVFileReader.cpp similarity index 100% rename from trunk2/core/plugins/boxes/file-io/src/box-algorithms/csv/ovpCBoxAlgorithmCSVFileReader.cpp rename to trunk2/core/plugins/algorithms/file-io/src/box-algorithms/csv/ovpCBoxAlgorithmCSVFileReader.cpp diff --git a/trunk2/core/plugins/boxes/file-io/src/box-algorithms/csv/ovpCBoxAlgorithmCSVFileReader.h b/trunk2/core/plugins/algorithms/file-io/src/box-algorithms/csv/ovpCBoxAlgorithmCSVFileReader.h similarity index 100% rename from trunk2/core/plugins/boxes/file-io/src/box-algorithms/csv/ovpCBoxAlgorithmCSVFileReader.h rename to trunk2/core/plugins/algorithms/file-io/src/box-algorithms/csv/ovpCBoxAlgorithmCSVFileReader.h diff --git a/trunk2/core/plugins/boxes/file-io/src/box-algorithms/csv/ovpCBoxAlgorithmCSVFileWriter.cpp b/trunk2/core/plugins/algorithms/file-io/src/box-algorithms/csv/ovpCBoxAlgorithmCSVFileWriter.cpp similarity index 100% rename from trunk2/core/plugins/boxes/file-io/src/box-algorithms/csv/ovpCBoxAlgorithmCSVFileWriter.cpp rename to trunk2/core/plugins/algorithms/file-io/src/box-algorithms/csv/ovpCBoxAlgorithmCSVFileWriter.cpp diff --git a/trunk2/core/plugins/boxes/file-io/src/box-algorithms/csv/ovpCBoxAlgorithmCSVFileWriter.h b/trunk2/core/plugins/algorithms/file-io/src/box-algorithms/csv/ovpCBoxAlgorithmCSVFileWriter.h similarity index 100% rename from trunk2/core/plugins/boxes/file-io/src/box-algorithms/csv/ovpCBoxAlgorithmCSVFileWriter.h rename to trunk2/core/plugins/algorithms/file-io/src/box-algorithms/csv/ovpCBoxAlgorithmCSVFileWriter.h diff --git a/trunk2/core/plugins/boxes/file-io/src/box-algorithms/edf/edflib.c b/trunk2/core/plugins/algorithms/file-io/src/box-algorithms/edf/edflib.c similarity index 100% rename from trunk2/core/plugins/boxes/file-io/src/box-algorithms/edf/edflib.c rename to trunk2/core/plugins/algorithms/file-io/src/box-algorithms/edf/edflib.c diff --git a/trunk2/core/plugins/boxes/file-io/src/box-algorithms/edf/edflib.h b/trunk2/core/plugins/algorithms/file-io/src/box-algorithms/edf/edflib.h similarity index 100% rename from trunk2/core/plugins/boxes/file-io/src/box-algorithms/edf/edflib.h rename to trunk2/core/plugins/algorithms/file-io/src/box-algorithms/edf/edflib.h diff --git a/trunk2/core/plugins/boxes/file-io/src/box-algorithms/edf/ovpCBoxAlgorithmEDFFileWriter.cpp b/trunk2/core/plugins/algorithms/file-io/src/box-algorithms/edf/ovpCBoxAlgorithmEDFFileWriter.cpp similarity index 100% rename from trunk2/core/plugins/boxes/file-io/src/box-algorithms/edf/ovpCBoxAlgorithmEDFFileWriter.cpp rename to trunk2/core/plugins/algorithms/file-io/src/box-algorithms/edf/ovpCBoxAlgorithmEDFFileWriter.cpp diff --git a/trunk2/core/plugins/boxes/file-io/src/box-algorithms/edf/ovpCBoxAlgorithmEDFFileWriter.h b/trunk2/core/plugins/algorithms/file-io/src/box-algorithms/edf/ovpCBoxAlgorithmEDFFileWriter.h similarity index 100% rename from trunk2/core/plugins/boxes/file-io/src/box-algorithms/edf/ovpCBoxAlgorithmEDFFileWriter.h rename to trunk2/core/plugins/algorithms/file-io/src/box-algorithms/edf/ovpCBoxAlgorithmEDFFileWriter.h diff --git a/trunk2/core/plugins/boxes/file-io/src/box-algorithms/openvibe/ovpCBoxAlgorithmGenericStreamReader.cpp b/trunk2/core/plugins/algorithms/file-io/src/box-algorithms/openvibe/ovpCBoxAlgorithmGenericStreamReader.cpp similarity index 100% rename from trunk2/core/plugins/boxes/file-io/src/box-algorithms/openvibe/ovpCBoxAlgorithmGenericStreamReader.cpp rename to trunk2/core/plugins/algorithms/file-io/src/box-algorithms/openvibe/ovpCBoxAlgorithmGenericStreamReader.cpp diff --git a/trunk2/core/plugins/boxes/file-io/src/box-algorithms/openvibe/ovpCBoxAlgorithmGenericStreamReader.h b/trunk2/core/plugins/algorithms/file-io/src/box-algorithms/openvibe/ovpCBoxAlgorithmGenericStreamReader.h similarity index 100% rename from trunk2/core/plugins/boxes/file-io/src/box-algorithms/openvibe/ovpCBoxAlgorithmGenericStreamReader.h rename to trunk2/core/plugins/algorithms/file-io/src/box-algorithms/openvibe/ovpCBoxAlgorithmGenericStreamReader.h diff --git a/trunk2/core/plugins/boxes/file-io/src/box-algorithms/openvibe/ovpCBoxAlgorithmGenericStreamWriter.cpp b/trunk2/core/plugins/algorithms/file-io/src/box-algorithms/openvibe/ovpCBoxAlgorithmGenericStreamWriter.cpp similarity index 100% rename from trunk2/core/plugins/boxes/file-io/src/box-algorithms/openvibe/ovpCBoxAlgorithmGenericStreamWriter.cpp rename to trunk2/core/plugins/algorithms/file-io/src/box-algorithms/openvibe/ovpCBoxAlgorithmGenericStreamWriter.cpp diff --git a/trunk2/core/plugins/boxes/file-io/src/box-algorithms/openvibe/ovpCBoxAlgorithmGenericStreamWriter.h b/trunk2/core/plugins/algorithms/file-io/src/box-algorithms/openvibe/ovpCBoxAlgorithmGenericStreamWriter.h similarity index 100% rename from trunk2/core/plugins/boxes/file-io/src/box-algorithms/openvibe/ovpCBoxAlgorithmGenericStreamWriter.h rename to trunk2/core/plugins/algorithms/file-io/src/box-algorithms/openvibe/ovpCBoxAlgorithmGenericStreamWriter.h diff --git a/trunk2/core/plugins/boxes/file-io/src/box-algorithms/ovpCBCICompetitionIIIbReader.cpp b/trunk2/core/plugins/algorithms/file-io/src/box-algorithms/ovpCBCICompetitionIIIbReader.cpp similarity index 100% rename from trunk2/core/plugins/boxes/file-io/src/box-algorithms/ovpCBCICompetitionIIIbReader.cpp rename to trunk2/core/plugins/algorithms/file-io/src/box-algorithms/ovpCBCICompetitionIIIbReader.cpp diff --git a/trunk2/core/plugins/boxes/file-io/src/box-algorithms/ovpCBCICompetitionIIIbReader.h b/trunk2/core/plugins/algorithms/file-io/src/box-algorithms/ovpCBCICompetitionIIIbReader.h similarity index 100% rename from trunk2/core/plugins/boxes/file-io/src/box-algorithms/ovpCBCICompetitionIIIbReader.h rename to trunk2/core/plugins/algorithms/file-io/src/box-algorithms/ovpCBCICompetitionIIIbReader.h diff --git a/trunk2/core/plugins/boxes/file-io/src/box-algorithms/ovpCBoxAlgorithmElectrodeLocalizationFileReader.cpp b/trunk2/core/plugins/algorithms/file-io/src/box-algorithms/ovpCBoxAlgorithmElectrodeLocalizationFileReader.cpp similarity index 100% rename from trunk2/core/plugins/boxes/file-io/src/box-algorithms/ovpCBoxAlgorithmElectrodeLocalizationFileReader.cpp rename to trunk2/core/plugins/algorithms/file-io/src/box-algorithms/ovpCBoxAlgorithmElectrodeLocalizationFileReader.cpp diff --git a/trunk2/core/plugins/boxes/file-io/src/box-algorithms/ovpCBoxAlgorithmElectrodeLocalizationFileReader.h b/trunk2/core/plugins/algorithms/file-io/src/box-algorithms/ovpCBoxAlgorithmElectrodeLocalizationFileReader.h similarity index 100% rename from trunk2/core/plugins/boxes/file-io/src/box-algorithms/ovpCBoxAlgorithmElectrodeLocalizationFileReader.h rename to trunk2/core/plugins/algorithms/file-io/src/box-algorithms/ovpCBoxAlgorithmElectrodeLocalizationFileReader.h diff --git a/trunk2/core/plugins/boxes/file-io/src/box-algorithms/ovpCBoxAlgorithmSignalConcatenation.cpp b/trunk2/core/plugins/algorithms/file-io/src/box-algorithms/ovpCBoxAlgorithmSignalConcatenation.cpp similarity index 100% rename from trunk2/core/plugins/boxes/file-io/src/box-algorithms/ovpCBoxAlgorithmSignalConcatenation.cpp rename to trunk2/core/plugins/algorithms/file-io/src/box-algorithms/ovpCBoxAlgorithmSignalConcatenation.cpp diff --git a/trunk2/core/plugins/boxes/file-io/src/box-algorithms/ovpCBoxAlgorithmSignalConcatenation.h b/trunk2/core/plugins/algorithms/file-io/src/box-algorithms/ovpCBoxAlgorithmSignalConcatenation.h similarity index 100% rename from trunk2/core/plugins/boxes/file-io/src/box-algorithms/ovpCBoxAlgorithmSignalConcatenation.h rename to trunk2/core/plugins/algorithms/file-io/src/box-algorithms/ovpCBoxAlgorithmSignalConcatenation.h diff --git a/trunk2/core/plugins/boxes/file-io/src/box-algorithms/ovpCGDFFileReader.cpp b/trunk2/core/plugins/algorithms/file-io/src/box-algorithms/ovpCGDFFileReader.cpp similarity index 100% rename from trunk2/core/plugins/boxes/file-io/src/box-algorithms/ovpCGDFFileReader.cpp rename to trunk2/core/plugins/algorithms/file-io/src/box-algorithms/ovpCGDFFileReader.cpp diff --git a/trunk2/core/plugins/boxes/file-io/src/box-algorithms/ovpCGDFFileReader.h b/trunk2/core/plugins/algorithms/file-io/src/box-algorithms/ovpCGDFFileReader.h similarity index 100% rename from trunk2/core/plugins/boxes/file-io/src/box-algorithms/ovpCGDFFileReader.h rename to trunk2/core/plugins/algorithms/file-io/src/box-algorithms/ovpCGDFFileReader.h diff --git a/trunk2/core/plugins/boxes/file-io/src/box-algorithms/ovpCGDFFileWriter.cpp b/trunk2/core/plugins/algorithms/file-io/src/box-algorithms/ovpCGDFFileWriter.cpp similarity index 100% rename from trunk2/core/plugins/boxes/file-io/src/box-algorithms/ovpCGDFFileWriter.cpp rename to trunk2/core/plugins/algorithms/file-io/src/box-algorithms/ovpCGDFFileWriter.cpp diff --git a/trunk2/core/plugins/boxes/file-io/src/box-algorithms/ovpCGDFFileWriter.h b/trunk2/core/plugins/algorithms/file-io/src/box-algorithms/ovpCGDFFileWriter.h similarity index 100% rename from trunk2/core/plugins/boxes/file-io/src/box-algorithms/ovpCGDFFileWriter.h rename to trunk2/core/plugins/algorithms/file-io/src/box-algorithms/ovpCGDFFileWriter.h diff --git a/trunk2/core/plugins/boxes/file-io/src/ovp_defines.h b/trunk2/core/plugins/algorithms/file-io/src/ovp_defines.h similarity index 100% rename from trunk2/core/plugins/boxes/file-io/src/ovp_defines.h rename to trunk2/core/plugins/algorithms/file-io/src/ovp_defines.h diff --git a/trunk2/core/plugins/boxes/file-io/src/ovp_gdf_helpers.cpp b/trunk2/core/plugins/algorithms/file-io/src/ovp_gdf_helpers.cpp similarity index 100% rename from trunk2/core/plugins/boxes/file-io/src/ovp_gdf_helpers.cpp rename to trunk2/core/plugins/algorithms/file-io/src/ovp_gdf_helpers.cpp diff --git a/trunk2/core/plugins/boxes/file-io/src/ovp_gdf_helpers.h b/trunk2/core/plugins/algorithms/file-io/src/ovp_gdf_helpers.h similarity index 100% rename from trunk2/core/plugins/boxes/file-io/src/ovp_gdf_helpers.h rename to trunk2/core/plugins/algorithms/file-io/src/ovp_gdf_helpers.h diff --git a/trunk2/core/plugins/boxes/file-io/src/ovp_main.cpp b/trunk2/core/plugins/algorithms/file-io/src/ovp_main.cpp similarity index 100% rename from trunk2/core/plugins/boxes/file-io/src/ovp_main.cpp rename to trunk2/core/plugins/algorithms/file-io/src/ovp_main.cpp diff --git a/trunk2/core/plugins/boxes/matlab/CMakeLists.txt b/trunk2/core/plugins/algorithms/matlab/CMakeLists.txt similarity index 100% rename from trunk2/core/plugins/boxes/matlab/CMakeLists.txt rename to trunk2/core/plugins/algorithms/matlab/CMakeLists.txt diff --git a/trunk2/core/plugins/boxes/matlab/doc/Doc_BoxAlgorithm_MatlabFilter.dox-part b/trunk2/core/plugins/algorithms/matlab/doc/Doc_BoxAlgorithm_MatlabFilter.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/matlab/doc/Doc_BoxAlgorithm_MatlabFilter.dox-part rename to trunk2/core/plugins/algorithms/matlab/doc/Doc_BoxAlgorithm_MatlabFilter.dox-part diff --git a/trunk2/core/plugins/boxes/matlab/doc/Doc_BoxAlgorithm_MatlabScripting.dox-part b/trunk2/core/plugins/algorithms/matlab/doc/Doc_BoxAlgorithm_MatlabScripting.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/matlab/doc/Doc_BoxAlgorithm_MatlabScripting.dox-part rename to trunk2/core/plugins/algorithms/matlab/doc/Doc_BoxAlgorithm_MatlabScripting.dox-part diff --git a/trunk2/core/plugins/boxes/matlab/doc/matlab_run_full.png b/trunk2/core/plugins/algorithms/matlab/doc/matlab_run_full.png similarity index 100% rename from trunk2/core/plugins/boxes/matlab/doc/matlab_run_full.png rename to trunk2/core/plugins/algorithms/matlab/doc/matlab_run_full.png diff --git a/trunk2/core/plugins/boxes/matlab/doc/matlab_scenar_config.png b/trunk2/core/plugins/algorithms/matlab/doc/matlab_scenar_config.png similarity index 100% rename from trunk2/core/plugins/boxes/matlab/doc/matlab_scenar_config.png rename to trunk2/core/plugins/algorithms/matlab/doc/matlab_scenar_config.png diff --git a/trunk2/core/plugins/boxes/matlab/share/OV_addInputBuffer.m b/trunk2/core/plugins/algorithms/matlab/share/OV_addInputBuffer.m similarity index 100% rename from trunk2/core/plugins/boxes/matlab/share/OV_addInputBuffer.m rename to trunk2/core/plugins/algorithms/matlab/share/OV_addInputBuffer.m diff --git a/trunk2/core/plugins/boxes/matlab/share/OV_addOutputBuffer.m b/trunk2/core/plugins/algorithms/matlab/share/OV_addOutputBuffer.m similarity index 100% rename from trunk2/core/plugins/boxes/matlab/share/OV_addOutputBuffer.m rename to trunk2/core/plugins/algorithms/matlab/share/OV_addOutputBuffer.m diff --git a/trunk2/core/plugins/boxes/matlab/share/OV_createBoxInstance.m b/trunk2/core/plugins/algorithms/matlab/share/OV_createBoxInstance.m similarity index 100% rename from trunk2/core/plugins/boxes/matlab/share/OV_createBoxInstance.m rename to trunk2/core/plugins/algorithms/matlab/share/OV_createBoxInstance.m diff --git a/trunk2/core/plugins/boxes/matlab/share/OV_define.m b/trunk2/core/plugins/algorithms/matlab/share/OV_define.m similarity index 100% rename from trunk2/core/plugins/boxes/matlab/share/OV_define.m rename to trunk2/core/plugins/algorithms/matlab/share/OV_define.m diff --git a/trunk2/core/plugins/boxes/matlab/share/OV_getChannelLocalisationOutputHeader.m b/trunk2/core/plugins/algorithms/matlab/share/OV_getChannelLocalisationOutputHeader.m similarity index 100% rename from trunk2/core/plugins/boxes/matlab/share/OV_getChannelLocalisationOutputHeader.m rename to trunk2/core/plugins/algorithms/matlab/share/OV_getChannelLocalisationOutputHeader.m diff --git a/trunk2/core/plugins/boxes/matlab/share/OV_getFeatureVectorOutputHeader.m b/trunk2/core/plugins/algorithms/matlab/share/OV_getFeatureVectorOutputHeader.m similarity index 100% rename from trunk2/core/plugins/boxes/matlab/share/OV_getFeatureVectorOutputHeader.m rename to trunk2/core/plugins/algorithms/matlab/share/OV_getFeatureVectorOutputHeader.m diff --git a/trunk2/core/plugins/boxes/matlab/share/OV_getNbPendingInputChunk.m b/trunk2/core/plugins/algorithms/matlab/share/OV_getNbPendingInputChunk.m similarity index 100% rename from trunk2/core/plugins/boxes/matlab/share/OV_getNbPendingInputChunk.m rename to trunk2/core/plugins/algorithms/matlab/share/OV_getNbPendingInputChunk.m diff --git a/trunk2/core/plugins/boxes/matlab/share/OV_getNbPendingOutputChunk.m b/trunk2/core/plugins/algorithms/matlab/share/OV_getNbPendingOutputChunk.m similarity index 100% rename from trunk2/core/plugins/boxes/matlab/share/OV_getNbPendingOutputChunk.m rename to trunk2/core/plugins/algorithms/matlab/share/OV_getNbPendingOutputChunk.m diff --git a/trunk2/core/plugins/boxes/matlab/share/OV_getSignalOutputHeader.m b/trunk2/core/plugins/algorithms/matlab/share/OV_getSignalOutputHeader.m similarity index 100% rename from trunk2/core/plugins/boxes/matlab/share/OV_getSignalOutputHeader.m rename to trunk2/core/plugins/algorithms/matlab/share/OV_getSignalOutputHeader.m diff --git a/trunk2/core/plugins/boxes/matlab/share/OV_getSpectrumOutputHeader.m b/trunk2/core/plugins/algorithms/matlab/share/OV_getSpectrumOutputHeader.m similarity index 100% rename from trunk2/core/plugins/boxes/matlab/share/OV_getSpectrumOutputHeader.m rename to trunk2/core/plugins/algorithms/matlab/share/OV_getSpectrumOutputHeader.m diff --git a/trunk2/core/plugins/boxes/matlab/share/OV_getStimulationOutputHeader.m b/trunk2/core/plugins/algorithms/matlab/share/OV_getStimulationOutputHeader.m similarity index 100% rename from trunk2/core/plugins/boxes/matlab/share/OV_getStimulationOutputHeader.m rename to trunk2/core/plugins/algorithms/matlab/share/OV_getStimulationOutputHeader.m diff --git a/trunk2/core/plugins/boxes/matlab/share/OV_getStimulationsOutputHeader.m b/trunk2/core/plugins/algorithms/matlab/share/OV_getStimulationsOutputHeader.m similarity index 100% rename from trunk2/core/plugins/boxes/matlab/share/OV_getStimulationsOutputHeader.m rename to trunk2/core/plugins/algorithms/matlab/share/OV_getStimulationsOutputHeader.m diff --git a/trunk2/core/plugins/boxes/matlab/share/OV_getStreamedMatrixOutputHeader.m b/trunk2/core/plugins/algorithms/matlab/share/OV_getStreamedMatrixOutputHeader.m similarity index 100% rename from trunk2/core/plugins/boxes/matlab/share/OV_getStreamedMatrixOutputHeader.m rename to trunk2/core/plugins/algorithms/matlab/share/OV_getStreamedMatrixOutputHeader.m diff --git a/trunk2/core/plugins/boxes/matlab/share/OV_popInputBuffer.m b/trunk2/core/plugins/algorithms/matlab/share/OV_popInputBuffer.m similarity index 100% rename from trunk2/core/plugins/boxes/matlab/share/OV_popInputBuffer.m rename to trunk2/core/plugins/algorithms/matlab/share/OV_popInputBuffer.m diff --git a/trunk2/core/plugins/boxes/matlab/share/OV_popOutputBuffer.m b/trunk2/core/plugins/algorithms/matlab/share/OV_popOutputBuffer.m similarity index 100% rename from trunk2/core/plugins/boxes/matlab/share/OV_popOutputBuffer.m rename to trunk2/core/plugins/algorithms/matlab/share/OV_popOutputBuffer.m diff --git a/trunk2/core/plugins/boxes/matlab/share/OV_popOutputBufferReshape.m b/trunk2/core/plugins/algorithms/matlab/share/OV_popOutputBufferReshape.m similarity index 100% rename from trunk2/core/plugins/boxes/matlab/share/OV_popOutputBufferReshape.m rename to trunk2/core/plugins/algorithms/matlab/share/OV_popOutputBufferReshape.m diff --git a/trunk2/core/plugins/boxes/matlab/share/OV_setChannelLocalisationInputHeader.m b/trunk2/core/plugins/algorithms/matlab/share/OV_setChannelLocalisationInputHeader.m similarity index 100% rename from trunk2/core/plugins/boxes/matlab/share/OV_setChannelLocalisationInputHeader.m rename to trunk2/core/plugins/algorithms/matlab/share/OV_setChannelLocalisationInputHeader.m diff --git a/trunk2/core/plugins/boxes/matlab/share/OV_setChannelLocalisationOutputHeader.m b/trunk2/core/plugins/algorithms/matlab/share/OV_setChannelLocalisationOutputHeader.m similarity index 100% rename from trunk2/core/plugins/boxes/matlab/share/OV_setChannelLocalisationOutputHeader.m rename to trunk2/core/plugins/algorithms/matlab/share/OV_setChannelLocalisationOutputHeader.m diff --git a/trunk2/core/plugins/boxes/matlab/share/OV_setFeatureVectorInputHeader.m b/trunk2/core/plugins/algorithms/matlab/share/OV_setFeatureVectorInputHeader.m similarity index 100% rename from trunk2/core/plugins/boxes/matlab/share/OV_setFeatureVectorInputHeader.m rename to trunk2/core/plugins/algorithms/matlab/share/OV_setFeatureVectorInputHeader.m diff --git a/trunk2/core/plugins/boxes/matlab/share/OV_setFeatureVectorOutputHeader.m b/trunk2/core/plugins/algorithms/matlab/share/OV_setFeatureVectorOutputHeader.m similarity index 100% rename from trunk2/core/plugins/boxes/matlab/share/OV_setFeatureVectorOutputHeader.m rename to trunk2/core/plugins/algorithms/matlab/share/OV_setFeatureVectorOutputHeader.m diff --git a/trunk2/core/plugins/boxes/matlab/share/OV_setSettings.m b/trunk2/core/plugins/algorithms/matlab/share/OV_setSettings.m similarity index 100% rename from trunk2/core/plugins/boxes/matlab/share/OV_setSettings.m rename to trunk2/core/plugins/algorithms/matlab/share/OV_setSettings.m diff --git a/trunk2/core/plugins/boxes/matlab/share/OV_setSignalInputHeader.m b/trunk2/core/plugins/algorithms/matlab/share/OV_setSignalInputHeader.m similarity index 100% rename from trunk2/core/plugins/boxes/matlab/share/OV_setSignalInputHeader.m rename to trunk2/core/plugins/algorithms/matlab/share/OV_setSignalInputHeader.m diff --git a/trunk2/core/plugins/boxes/matlab/share/OV_setSignalOutputHeader.m b/trunk2/core/plugins/algorithms/matlab/share/OV_setSignalOutputHeader.m similarity index 100% rename from trunk2/core/plugins/boxes/matlab/share/OV_setSignalOutputHeader.m rename to trunk2/core/plugins/algorithms/matlab/share/OV_setSignalOutputHeader.m diff --git a/trunk2/core/plugins/boxes/matlab/share/OV_setSpectrumInputHeader.m b/trunk2/core/plugins/algorithms/matlab/share/OV_setSpectrumInputHeader.m similarity index 100% rename from trunk2/core/plugins/boxes/matlab/share/OV_setSpectrumInputHeader.m rename to trunk2/core/plugins/algorithms/matlab/share/OV_setSpectrumInputHeader.m diff --git a/trunk2/core/plugins/boxes/matlab/share/OV_setSpectrumOutputHeader.m b/trunk2/core/plugins/algorithms/matlab/share/OV_setSpectrumOutputHeader.m similarity index 100% rename from trunk2/core/plugins/boxes/matlab/share/OV_setSpectrumOutputHeader.m rename to trunk2/core/plugins/algorithms/matlab/share/OV_setSpectrumOutputHeader.m diff --git a/trunk2/core/plugins/boxes/matlab/share/OV_setStimulationInputHeader.m b/trunk2/core/plugins/algorithms/matlab/share/OV_setStimulationInputHeader.m similarity index 100% rename from trunk2/core/plugins/boxes/matlab/share/OV_setStimulationInputHeader.m rename to trunk2/core/plugins/algorithms/matlab/share/OV_setStimulationInputHeader.m diff --git a/trunk2/core/plugins/boxes/matlab/share/OV_setStimulationOutputHeader.m b/trunk2/core/plugins/algorithms/matlab/share/OV_setStimulationOutputHeader.m similarity index 100% rename from trunk2/core/plugins/boxes/matlab/share/OV_setStimulationOutputHeader.m rename to trunk2/core/plugins/algorithms/matlab/share/OV_setStimulationOutputHeader.m diff --git a/trunk2/core/plugins/boxes/matlab/share/OV_setStimulationsInputHeader.m b/trunk2/core/plugins/algorithms/matlab/share/OV_setStimulationsInputHeader.m similarity index 100% rename from trunk2/core/plugins/boxes/matlab/share/OV_setStimulationsInputHeader.m rename to trunk2/core/plugins/algorithms/matlab/share/OV_setStimulationsInputHeader.m diff --git a/trunk2/core/plugins/boxes/matlab/share/OV_setStimulationsOutputHeader.m b/trunk2/core/plugins/algorithms/matlab/share/OV_setStimulationsOutputHeader.m similarity index 100% rename from trunk2/core/plugins/boxes/matlab/share/OV_setStimulationsOutputHeader.m rename to trunk2/core/plugins/algorithms/matlab/share/OV_setStimulationsOutputHeader.m diff --git a/trunk2/core/plugins/boxes/matlab/share/OV_setStreamedMatrixInputHeader.m b/trunk2/core/plugins/algorithms/matlab/share/OV_setStreamedMatrixInputHeader.m similarity index 100% rename from trunk2/core/plugins/boxes/matlab/share/OV_setStreamedMatrixInputHeader.m rename to trunk2/core/plugins/algorithms/matlab/share/OV_setStreamedMatrixInputHeader.m diff --git a/trunk2/core/plugins/boxes/matlab/share/OV_setStreamedMatrixOutputHeader.m b/trunk2/core/plugins/algorithms/matlab/share/OV_setStreamedMatrixOutputHeader.m similarity index 100% rename from trunk2/core/plugins/boxes/matlab/share/OV_setStreamedMatrixOutputHeader.m rename to trunk2/core/plugins/algorithms/matlab/share/OV_setStreamedMatrixOutputHeader.m diff --git a/trunk2/core/plugins/boxes/matlab/src/box-algorithms/ovpCBoxAlgorithmMatlabFilter.cpp b/trunk2/core/plugins/algorithms/matlab/src/box-algorithms/ovpCBoxAlgorithmMatlabFilter.cpp similarity index 100% rename from trunk2/core/plugins/boxes/matlab/src/box-algorithms/ovpCBoxAlgorithmMatlabFilter.cpp rename to trunk2/core/plugins/algorithms/matlab/src/box-algorithms/ovpCBoxAlgorithmMatlabFilter.cpp diff --git a/trunk2/core/plugins/boxes/matlab/src/box-algorithms/ovpCBoxAlgorithmMatlabFilter.h b/trunk2/core/plugins/algorithms/matlab/src/box-algorithms/ovpCBoxAlgorithmMatlabFilter.h similarity index 100% rename from trunk2/core/plugins/boxes/matlab/src/box-algorithms/ovpCBoxAlgorithmMatlabFilter.h rename to trunk2/core/plugins/algorithms/matlab/src/box-algorithms/ovpCBoxAlgorithmMatlabFilter.h diff --git a/trunk2/core/plugins/boxes/matlab/src/box-algorithms/ovpCBoxAlgorithmMatlabScripting.cpp b/trunk2/core/plugins/algorithms/matlab/src/box-algorithms/ovpCBoxAlgorithmMatlabScripting.cpp similarity index 100% rename from trunk2/core/plugins/boxes/matlab/src/box-algorithms/ovpCBoxAlgorithmMatlabScripting.cpp rename to trunk2/core/plugins/algorithms/matlab/src/box-algorithms/ovpCBoxAlgorithmMatlabScripting.cpp diff --git a/trunk2/core/plugins/boxes/matlab/src/box-algorithms/ovpCBoxAlgorithmMatlabScripting.h b/trunk2/core/plugins/algorithms/matlab/src/box-algorithms/ovpCBoxAlgorithmMatlabScripting.h similarity index 100% rename from trunk2/core/plugins/boxes/matlab/src/box-algorithms/ovpCBoxAlgorithmMatlabScripting.h rename to trunk2/core/plugins/algorithms/matlab/src/box-algorithms/ovpCBoxAlgorithmMatlabScripting.h diff --git a/trunk2/core/plugins/boxes/matlab/src/ovpCMatlabHelper.cpp b/trunk2/core/plugins/algorithms/matlab/src/ovpCMatlabHelper.cpp similarity index 100% rename from trunk2/core/plugins/boxes/matlab/src/ovpCMatlabHelper.cpp rename to trunk2/core/plugins/algorithms/matlab/src/ovpCMatlabHelper.cpp diff --git a/trunk2/core/plugins/boxes/matlab/src/ovpCMatlabHelper.h b/trunk2/core/plugins/algorithms/matlab/src/ovpCMatlabHelper.h similarity index 100% rename from trunk2/core/plugins/boxes/matlab/src/ovpCMatlabHelper.h rename to trunk2/core/plugins/algorithms/matlab/src/ovpCMatlabHelper.h diff --git a/trunk2/core/plugins/boxes/matlab/src/ovp_defines.h b/trunk2/core/plugins/algorithms/matlab/src/ovp_defines.h similarity index 100% rename from trunk2/core/plugins/boxes/matlab/src/ovp_defines.h rename to trunk2/core/plugins/algorithms/matlab/src/ovp_defines.h diff --git a/trunk2/core/plugins/boxes/matlab/src/ovp_main.cpp b/trunk2/core/plugins/algorithms/matlab/src/ovp_main.cpp similarity index 100% rename from trunk2/core/plugins/boxes/matlab/src/ovp_main.cpp rename to trunk2/core/plugins/algorithms/matlab/src/ovp_main.cpp diff --git a/trunk2/core/plugins/boxes/python/CMakeLists.txt b/trunk2/core/plugins/algorithms/python/CMakeLists.txt similarity index 100% rename from trunk2/core/plugins/boxes/python/CMakeLists.txt rename to trunk2/core/plugins/algorithms/python/CMakeLists.txt diff --git a/trunk2/core/plugins/boxes/python/doc/Doc_BoxAlgorithm_PythonScripting.dox-part b/trunk2/core/plugins/algorithms/python/doc/Doc_BoxAlgorithm_PythonScripting.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/python/doc/Doc_BoxAlgorithm_PythonScripting.dox-part rename to trunk2/core/plugins/algorithms/python/doc/Doc_BoxAlgorithm_PythonScripting.dox-part diff --git a/trunk2/core/plugins/boxes/python/share/StimulationsCodes.py b/trunk2/core/plugins/algorithms/python/share/StimulationsCodes.py similarity index 100% rename from trunk2/core/plugins/boxes/python/share/StimulationsCodes.py rename to trunk2/core/plugins/algorithms/python/share/StimulationsCodes.py diff --git a/trunk2/core/plugins/boxes/python/share/openvibe.py b/trunk2/core/plugins/algorithms/python/share/openvibe.py similarity index 100% rename from trunk2/core/plugins/boxes/python/share/openvibe.py rename to trunk2/core/plugins/algorithms/python/share/openvibe.py diff --git a/trunk2/core/plugins/boxes/python/src/box-algorithms/ovpCBoxAlgorithmPython.cpp b/trunk2/core/plugins/algorithms/python/src/box-algorithms/ovpCBoxAlgorithmPython.cpp similarity index 100% rename from trunk2/core/plugins/boxes/python/src/box-algorithms/ovpCBoxAlgorithmPython.cpp rename to trunk2/core/plugins/algorithms/python/src/box-algorithms/ovpCBoxAlgorithmPython.cpp diff --git a/trunk2/core/plugins/boxes/python/src/box-algorithms/ovpCBoxAlgorithmPython.h b/trunk2/core/plugins/algorithms/python/src/box-algorithms/ovpCBoxAlgorithmPython.h similarity index 100% rename from trunk2/core/plugins/boxes/python/src/box-algorithms/ovpCBoxAlgorithmPython.h rename to trunk2/core/plugins/algorithms/python/src/box-algorithms/ovpCBoxAlgorithmPython.h diff --git a/trunk2/core/plugins/boxes/python/src/ovp_defines.h b/trunk2/core/plugins/algorithms/python/src/ovp_defines.h similarity index 100% rename from trunk2/core/plugins/boxes/python/src/ovp_defines.h rename to trunk2/core/plugins/algorithms/python/src/ovp_defines.h diff --git a/trunk2/core/plugins/boxes/python/src/ovp_main.cpp b/trunk2/core/plugins/algorithms/python/src/ovp_main.cpp similarity index 100% rename from trunk2/core/plugins/boxes/python/src/ovp_main.cpp rename to trunk2/core/plugins/algorithms/python/src/ovp_main.cpp diff --git a/trunk2/core/plugins/boxes/samples/CMakeLists.txt b/trunk2/core/plugins/algorithms/samples/CMakeLists.txt similarity index 100% rename from trunk2/core/plugins/boxes/samples/CMakeLists.txt rename to trunk2/core/plugins/algorithms/samples/CMakeLists.txt diff --git a/trunk2/core/plugins/boxes/samples/doc/Doc_BoxAlgorithm_ClockStimulator.dox-part b/trunk2/core/plugins/algorithms/samples/doc/Doc_BoxAlgorithm_ClockStimulator.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/samples/doc/Doc_BoxAlgorithm_ClockStimulator.dox-part rename to trunk2/core/plugins/algorithms/samples/doc/Doc_BoxAlgorithm_ClockStimulator.dox-part diff --git a/trunk2/core/plugins/boxes/samples/doc/Doc_BoxAlgorithm_CodecToolkitTestbox.dox-part b/trunk2/core/plugins/algorithms/samples/doc/Doc_BoxAlgorithm_CodecToolkitTestbox.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/samples/doc/Doc_BoxAlgorithm_CodecToolkitTestbox.dox-part rename to trunk2/core/plugins/algorithms/samples/doc/Doc_BoxAlgorithm_CodecToolkitTestbox.dox-part diff --git a/trunk2/core/plugins/boxes/samples/doc/Doc_BoxAlgorithm_Identity.dox-part b/trunk2/core/plugins/algorithms/samples/doc/Doc_BoxAlgorithm_Identity.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/samples/doc/Doc_BoxAlgorithm_Identity.dox-part rename to trunk2/core/plugins/algorithms/samples/doc/Doc_BoxAlgorithm_Identity.dox-part diff --git a/trunk2/core/plugins/boxes/samples/doc/Doc_BoxAlgorithm_SinusOscillator.dox-part b/trunk2/core/plugins/algorithms/samples/doc/Doc_BoxAlgorithm_SinusOscillator.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/samples/doc/Doc_BoxAlgorithm_SinusOscillator.dox-part rename to trunk2/core/plugins/algorithms/samples/doc/Doc_BoxAlgorithm_SinusOscillator.dox-part diff --git a/trunk2/core/plugins/boxes/samples/doc/Doc_BoxAlgorithm_TimeSignal.dox-part b/trunk2/core/plugins/algorithms/samples/doc/Doc_BoxAlgorithm_TimeSignal.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/samples/doc/Doc_BoxAlgorithm_TimeSignal.dox-part rename to trunk2/core/plugins/algorithms/samples/doc/Doc_BoxAlgorithm_TimeSignal.dox-part diff --git a/trunk2/core/plugins/boxes/samples/doc/sinussignalgenerator_online.png b/trunk2/core/plugins/algorithms/samples/doc/sinussignalgenerator_online.png similarity index 100% rename from trunk2/core/plugins/boxes/samples/doc/sinussignalgenerator_online.png rename to trunk2/core/plugins/algorithms/samples/doc/sinussignalgenerator_online.png diff --git a/trunk2/core/plugins/boxes/samples/doc/sinussignalgenerator_scenario.png b/trunk2/core/plugins/algorithms/samples/doc/sinussignalgenerator_scenario.png similarity index 100% rename from trunk2/core/plugins/boxes/samples/doc/sinussignalgenerator_scenario.png rename to trunk2/core/plugins/algorithms/samples/doc/sinussignalgenerator_scenario.png diff --git a/trunk2/core/plugins/boxes/samples/src/algorithms/ovpCAlgorithmAddition.cpp b/trunk2/core/plugins/algorithms/samples/src/algorithms/ovpCAlgorithmAddition.cpp similarity index 100% rename from trunk2/core/plugins/boxes/samples/src/algorithms/ovpCAlgorithmAddition.cpp rename to trunk2/core/plugins/algorithms/samples/src/algorithms/ovpCAlgorithmAddition.cpp diff --git a/trunk2/core/plugins/boxes/samples/src/algorithms/ovpCAlgorithmAddition.h b/trunk2/core/plugins/algorithms/samples/src/algorithms/ovpCAlgorithmAddition.h similarity index 100% rename from trunk2/core/plugins/boxes/samples/src/algorithms/ovpCAlgorithmAddition.h rename to trunk2/core/plugins/algorithms/samples/src/algorithms/ovpCAlgorithmAddition.h diff --git a/trunk2/core/plugins/boxes/samples/src/box-algorithms/ovpCBoxAlgorithmAdditionTest.cpp b/trunk2/core/plugins/algorithms/samples/src/box-algorithms/ovpCBoxAlgorithmAdditionTest.cpp similarity index 100% rename from trunk2/core/plugins/boxes/samples/src/box-algorithms/ovpCBoxAlgorithmAdditionTest.cpp rename to trunk2/core/plugins/algorithms/samples/src/box-algorithms/ovpCBoxAlgorithmAdditionTest.cpp diff --git a/trunk2/core/plugins/boxes/samples/src/box-algorithms/ovpCBoxAlgorithmAdditionTest.h b/trunk2/core/plugins/algorithms/samples/src/box-algorithms/ovpCBoxAlgorithmAdditionTest.h similarity index 100% rename from trunk2/core/plugins/boxes/samples/src/box-algorithms/ovpCBoxAlgorithmAdditionTest.h rename to trunk2/core/plugins/algorithms/samples/src/box-algorithms/ovpCBoxAlgorithmAdditionTest.h diff --git a/trunk2/core/plugins/boxes/samples/src/box-algorithms/ovpCBoxAlgorithmClock.cpp b/trunk2/core/plugins/algorithms/samples/src/box-algorithms/ovpCBoxAlgorithmClock.cpp similarity index 100% rename from trunk2/core/plugins/boxes/samples/src/box-algorithms/ovpCBoxAlgorithmClock.cpp rename to trunk2/core/plugins/algorithms/samples/src/box-algorithms/ovpCBoxAlgorithmClock.cpp diff --git a/trunk2/core/plugins/boxes/samples/src/box-algorithms/ovpCBoxAlgorithmClock.h b/trunk2/core/plugins/algorithms/samples/src/box-algorithms/ovpCBoxAlgorithmClock.h similarity index 100% rename from trunk2/core/plugins/boxes/samples/src/box-algorithms/ovpCBoxAlgorithmClock.h rename to trunk2/core/plugins/algorithms/samples/src/box-algorithms/ovpCBoxAlgorithmClock.h diff --git a/trunk2/core/plugins/boxes/samples/src/box-algorithms/ovpCBoxAlgorithmClockStimulator.cpp b/trunk2/core/plugins/algorithms/samples/src/box-algorithms/ovpCBoxAlgorithmClockStimulator.cpp similarity index 100% rename from trunk2/core/plugins/boxes/samples/src/box-algorithms/ovpCBoxAlgorithmClockStimulator.cpp rename to trunk2/core/plugins/algorithms/samples/src/box-algorithms/ovpCBoxAlgorithmClockStimulator.cpp diff --git a/trunk2/core/plugins/boxes/samples/src/box-algorithms/ovpCBoxAlgorithmClockStimulator.h b/trunk2/core/plugins/algorithms/samples/src/box-algorithms/ovpCBoxAlgorithmClockStimulator.h similarity index 100% rename from trunk2/core/plugins/boxes/samples/src/box-algorithms/ovpCBoxAlgorithmClockStimulator.h rename to trunk2/core/plugins/algorithms/samples/src/box-algorithms/ovpCBoxAlgorithmClockStimulator.h diff --git a/trunk2/core/plugins/boxes/samples/src/box-algorithms/ovpCBoxAlgorithmMeanVariance.cpp b/trunk2/core/plugins/algorithms/samples/src/box-algorithms/ovpCBoxAlgorithmMeanVariance.cpp similarity index 100% rename from trunk2/core/plugins/boxes/samples/src/box-algorithms/ovpCBoxAlgorithmMeanVariance.cpp rename to trunk2/core/plugins/algorithms/samples/src/box-algorithms/ovpCBoxAlgorithmMeanVariance.cpp diff --git a/trunk2/core/plugins/boxes/samples/src/box-algorithms/ovpCBoxAlgorithmMeanVariance.h b/trunk2/core/plugins/algorithms/samples/src/box-algorithms/ovpCBoxAlgorithmMeanVariance.h similarity index 100% rename from trunk2/core/plugins/boxes/samples/src/box-algorithms/ovpCBoxAlgorithmMeanVariance.h rename to trunk2/core/plugins/algorithms/samples/src/box-algorithms/ovpCBoxAlgorithmMeanVariance.h diff --git a/trunk2/core/plugins/boxes/samples/src/box-algorithms/ovpCBoxAlgorithmNothing.cpp b/trunk2/core/plugins/algorithms/samples/src/box-algorithms/ovpCBoxAlgorithmNothing.cpp similarity index 100% rename from trunk2/core/plugins/boxes/samples/src/box-algorithms/ovpCBoxAlgorithmNothing.cpp rename to trunk2/core/plugins/algorithms/samples/src/box-algorithms/ovpCBoxAlgorithmNothing.cpp diff --git a/trunk2/core/plugins/boxes/samples/src/box-algorithms/ovpCBoxAlgorithmNothing.h b/trunk2/core/plugins/algorithms/samples/src/box-algorithms/ovpCBoxAlgorithmNothing.h similarity index 100% rename from trunk2/core/plugins/boxes/samples/src/box-algorithms/ovpCBoxAlgorithmNothing.h rename to trunk2/core/plugins/algorithms/samples/src/box-algorithms/ovpCBoxAlgorithmNothing.h diff --git a/trunk2/core/plugins/boxes/samples/src/box-algorithms/ovpCCrashingBox.cpp b/trunk2/core/plugins/algorithms/samples/src/box-algorithms/ovpCCrashingBox.cpp similarity index 100% rename from trunk2/core/plugins/boxes/samples/src/box-algorithms/ovpCCrashingBox.cpp rename to trunk2/core/plugins/algorithms/samples/src/box-algorithms/ovpCCrashingBox.cpp diff --git a/trunk2/core/plugins/boxes/samples/src/box-algorithms/ovpCCrashingBox.h b/trunk2/core/plugins/algorithms/samples/src/box-algorithms/ovpCCrashingBox.h similarity index 100% rename from trunk2/core/plugins/boxes/samples/src/box-algorithms/ovpCCrashingBox.h rename to trunk2/core/plugins/algorithms/samples/src/box-algorithms/ovpCCrashingBox.h diff --git a/trunk2/core/plugins/boxes/samples/src/box-algorithms/ovpCIdentity.cpp b/trunk2/core/plugins/algorithms/samples/src/box-algorithms/ovpCIdentity.cpp similarity index 100% rename from trunk2/core/plugins/boxes/samples/src/box-algorithms/ovpCIdentity.cpp rename to trunk2/core/plugins/algorithms/samples/src/box-algorithms/ovpCIdentity.cpp diff --git a/trunk2/core/plugins/boxes/samples/src/box-algorithms/ovpCIdentity.h b/trunk2/core/plugins/algorithms/samples/src/box-algorithms/ovpCIdentity.h similarity index 100% rename from trunk2/core/plugins/boxes/samples/src/box-algorithms/ovpCIdentity.h rename to trunk2/core/plugins/algorithms/samples/src/box-algorithms/ovpCIdentity.h diff --git a/trunk2/core/plugins/boxes/samples/src/box-algorithms/ovpCLog.cpp b/trunk2/core/plugins/algorithms/samples/src/box-algorithms/ovpCLog.cpp similarity index 100% rename from trunk2/core/plugins/boxes/samples/src/box-algorithms/ovpCLog.cpp rename to trunk2/core/plugins/algorithms/samples/src/box-algorithms/ovpCLog.cpp diff --git a/trunk2/core/plugins/boxes/samples/src/box-algorithms/ovpCLog.h b/trunk2/core/plugins/algorithms/samples/src/box-algorithms/ovpCLog.h similarity index 100% rename from trunk2/core/plugins/boxes/samples/src/box-algorithms/ovpCLog.h rename to trunk2/core/plugins/algorithms/samples/src/box-algorithms/ovpCLog.h diff --git a/trunk2/core/plugins/boxes/samples/src/box-algorithms/ovpCSinusSignalGenerator.cpp b/trunk2/core/plugins/algorithms/samples/src/box-algorithms/ovpCSinusSignalGenerator.cpp similarity index 100% rename from trunk2/core/plugins/boxes/samples/src/box-algorithms/ovpCSinusSignalGenerator.cpp rename to trunk2/core/plugins/algorithms/samples/src/box-algorithms/ovpCSinusSignalGenerator.cpp diff --git a/trunk2/core/plugins/boxes/samples/src/box-algorithms/ovpCSinusSignalGenerator.h b/trunk2/core/plugins/algorithms/samples/src/box-algorithms/ovpCSinusSignalGenerator.h similarity index 100% rename from trunk2/core/plugins/boxes/samples/src/box-algorithms/ovpCSinusSignalGenerator.h rename to trunk2/core/plugins/algorithms/samples/src/box-algorithms/ovpCSinusSignalGenerator.h diff --git a/trunk2/core/plugins/boxes/samples/src/box-algorithms/ovpCTest.cpp b/trunk2/core/plugins/algorithms/samples/src/box-algorithms/ovpCTest.cpp similarity index 100% rename from trunk2/core/plugins/boxes/samples/src/box-algorithms/ovpCTest.cpp rename to trunk2/core/plugins/algorithms/samples/src/box-algorithms/ovpCTest.cpp diff --git a/trunk2/core/plugins/boxes/samples/src/box-algorithms/ovpCTest.h b/trunk2/core/plugins/algorithms/samples/src/box-algorithms/ovpCTest.h similarity index 100% rename from trunk2/core/plugins/boxes/samples/src/box-algorithms/ovpCTest.h rename to trunk2/core/plugins/algorithms/samples/src/box-algorithms/ovpCTest.h diff --git a/trunk2/core/plugins/boxes/samples/src/box-algorithms/ovpCTestCodecToolkit.cpp b/trunk2/core/plugins/algorithms/samples/src/box-algorithms/ovpCTestCodecToolkit.cpp similarity index 100% rename from trunk2/core/plugins/boxes/samples/src/box-algorithms/ovpCTestCodecToolkit.cpp rename to trunk2/core/plugins/algorithms/samples/src/box-algorithms/ovpCTestCodecToolkit.cpp diff --git a/trunk2/core/plugins/boxes/samples/src/box-algorithms/ovpCTestCodecToolkit.h b/trunk2/core/plugins/algorithms/samples/src/box-algorithms/ovpCTestCodecToolkit.h similarity index 100% rename from trunk2/core/plugins/boxes/samples/src/box-algorithms/ovpCTestCodecToolkit.h rename to trunk2/core/plugins/algorithms/samples/src/box-algorithms/ovpCTestCodecToolkit.h diff --git a/trunk2/core/plugins/boxes/samples/src/box-algorithms/ovpCTimeSignalGenerator.cpp b/trunk2/core/plugins/algorithms/samples/src/box-algorithms/ovpCTimeSignalGenerator.cpp similarity index 100% rename from trunk2/core/plugins/boxes/samples/src/box-algorithms/ovpCTimeSignalGenerator.cpp rename to trunk2/core/plugins/algorithms/samples/src/box-algorithms/ovpCTimeSignalGenerator.cpp diff --git a/trunk2/core/plugins/boxes/samples/src/box-algorithms/ovpCTimeSignalGenerator.h b/trunk2/core/plugins/algorithms/samples/src/box-algorithms/ovpCTimeSignalGenerator.h similarity index 100% rename from trunk2/core/plugins/boxes/samples/src/box-algorithms/ovpCTimeSignalGenerator.h rename to trunk2/core/plugins/algorithms/samples/src/box-algorithms/ovpCTimeSignalGenerator.h diff --git a/trunk2/core/plugins/boxes/samples/src/ovpCScenarioExporterSVG.cpp b/trunk2/core/plugins/algorithms/samples/src/ovpCScenarioExporterSVG.cpp similarity index 100% rename from trunk2/core/plugins/boxes/samples/src/ovpCScenarioExporterSVG.cpp rename to trunk2/core/plugins/algorithms/samples/src/ovpCScenarioExporterSVG.cpp diff --git a/trunk2/core/plugins/boxes/samples/src/ovpCScenarioExporterSVG.h b/trunk2/core/plugins/algorithms/samples/src/ovpCScenarioExporterSVG.h similarity index 100% rename from trunk2/core/plugins/boxes/samples/src/ovpCScenarioExporterSVG.h rename to trunk2/core/plugins/algorithms/samples/src/ovpCScenarioExporterSVG.h diff --git a/trunk2/core/plugins/boxes/samples/src/ovpCScenarioExporterXML.cpp b/trunk2/core/plugins/algorithms/samples/src/ovpCScenarioExporterXML.cpp similarity index 100% rename from trunk2/core/plugins/boxes/samples/src/ovpCScenarioExporterXML.cpp rename to trunk2/core/plugins/algorithms/samples/src/ovpCScenarioExporterXML.cpp diff --git a/trunk2/core/plugins/boxes/samples/src/ovpCScenarioExporterXML.h b/trunk2/core/plugins/algorithms/samples/src/ovpCScenarioExporterXML.h similarity index 100% rename from trunk2/core/plugins/boxes/samples/src/ovpCScenarioExporterXML.h rename to trunk2/core/plugins/algorithms/samples/src/ovpCScenarioExporterXML.h diff --git a/trunk2/core/plugins/boxes/samples/src/ovpCScenarioImporterXML.cpp b/trunk2/core/plugins/algorithms/samples/src/ovpCScenarioImporterXML.cpp similarity index 100% rename from trunk2/core/plugins/boxes/samples/src/ovpCScenarioImporterXML.cpp rename to trunk2/core/plugins/algorithms/samples/src/ovpCScenarioImporterXML.cpp diff --git a/trunk2/core/plugins/boxes/samples/src/ovpCScenarioImporterXML.h b/trunk2/core/plugins/algorithms/samples/src/ovpCScenarioImporterXML.h similarity index 100% rename from trunk2/core/plugins/boxes/samples/src/ovpCScenarioImporterXML.h rename to trunk2/core/plugins/algorithms/samples/src/ovpCScenarioImporterXML.h diff --git a/trunk2/core/plugins/boxes/samples/src/ovp_defines.h b/trunk2/core/plugins/algorithms/samples/src/ovp_defines.h similarity index 100% rename from trunk2/core/plugins/boxes/samples/src/ovp_defines.h rename to trunk2/core/plugins/algorithms/samples/src/ovp_defines.h diff --git a/trunk2/core/plugins/boxes/samples/src/ovp_main.cpp b/trunk2/core/plugins/algorithms/samples/src/ovp_main.cpp similarity index 100% rename from trunk2/core/plugins/boxes/samples/src/ovp_main.cpp rename to trunk2/core/plugins/algorithms/samples/src/ovp_main.cpp diff --git a/trunk2/core/plugins/boxes/samples/test/DartTestfile.txt b/trunk2/core/plugins/algorithms/samples/test/DartTestfile.txt similarity index 100% rename from trunk2/core/plugins/boxes/samples/test/DartTestfile.txt rename to trunk2/core/plugins/algorithms/samples/test/DartTestfile.txt diff --git a/trunk2/core/plugins/boxes/samples/test/SinusOscillator.ref.csv b/trunk2/core/plugins/algorithms/samples/test/SinusOscillator.ref.csv similarity index 100% rename from trunk2/core/plugins/boxes/samples/test/SinusOscillator.ref.csv rename to trunk2/core/plugins/algorithms/samples/test/SinusOscillator.ref.csv diff --git a/trunk2/core/plugins/boxes/samples/test/SinusOscillator.xml b/trunk2/core/plugins/algorithms/samples/test/SinusOscillator.xml similarity index 100% rename from trunk2/core/plugins/boxes/samples/test/SinusOscillator.xml rename to trunk2/core/plugins/algorithms/samples/test/SinusOscillator.xml diff --git a/trunk2/core/plugins/boxes/signal-processing-gpl/CMakeLists.txt b/trunk2/core/plugins/algorithms/signal-processing-gpl/CMakeLists.txt similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing-gpl/CMakeLists.txt rename to trunk2/core/plugins/algorithms/signal-processing-gpl/CMakeLists.txt diff --git a/trunk2/core/plugins/boxes/signal-processing-gpl/doc/BoxAlgorithm_DownsamplingGPL.dox-part b/trunk2/core/plugins/algorithms/signal-processing-gpl/doc/BoxAlgorithm_DownsamplingGPL.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing-gpl/doc/BoxAlgorithm_DownsamplingGPL.dox-part rename to trunk2/core/plugins/algorithms/signal-processing-gpl/doc/BoxAlgorithm_DownsamplingGPL.dox-part diff --git a/trunk2/core/plugins/boxes/signal-processing-gpl/doc/BoxAlgorithm_IndependentComponentAnalysisFastICAGPL.dox-part b/trunk2/core/plugins/algorithms/signal-processing-gpl/doc/BoxAlgorithm_IndependentComponentAnalysisFastICAGPL.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing-gpl/doc/BoxAlgorithm_IndependentComponentAnalysisFastICAGPL.dox-part rename to trunk2/core/plugins/algorithms/signal-processing-gpl/doc/BoxAlgorithm_IndependentComponentAnalysisFastICAGPL.dox-part diff --git a/trunk2/core/plugins/boxes/signal-processing-gpl/doc/BoxAlgorithm_Min_MaxDetectionGPL.dox-part b/trunk2/core/plugins/algorithms/signal-processing-gpl/doc/BoxAlgorithm_Min_MaxDetectionGPL.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing-gpl/doc/BoxAlgorithm_Min_MaxDetectionGPL.dox-part rename to trunk2/core/plugins/algorithms/signal-processing-gpl/doc/BoxAlgorithm_Min_MaxDetectionGPL.dox-part diff --git a/trunk2/core/plugins/boxes/signal-processing-gpl/doc/BoxAlgorithm_TemporalFilterGPL.dox-part b/trunk2/core/plugins/algorithms/signal-processing-gpl/doc/BoxAlgorithm_TemporalFilterGPL.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing-gpl/doc/BoxAlgorithm_TemporalFilterGPL.dox-part rename to trunk2/core/plugins/algorithms/signal-processing-gpl/doc/BoxAlgorithm_TemporalFilterGPL.dox-part diff --git a/trunk2/core/plugins/boxes/signal-processing-gpl/doc/BoxAlgorithm_WindowingFunctionsGPL.dox-part b/trunk2/core/plugins/algorithms/signal-processing-gpl/doc/BoxAlgorithm_WindowingFunctionsGPL.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing-gpl/doc/BoxAlgorithm_WindowingFunctionsGPL.dox-part rename to trunk2/core/plugins/algorithms/signal-processing-gpl/doc/BoxAlgorithm_WindowingFunctionsGPL.dox-part diff --git a/trunk2/core/plugins/boxes/signal-processing-gpl/doc/Doc_BoxAlgorithm_CSPSpatialFilterTrainer.dox-part b/trunk2/core/plugins/algorithms/signal-processing-gpl/doc/Doc_BoxAlgorithm_CSPSpatialFilterTrainer.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing-gpl/doc/Doc_BoxAlgorithm_CSPSpatialFilterTrainer.dox-part rename to trunk2/core/plugins/algorithms/signal-processing-gpl/doc/Doc_BoxAlgorithm_CSPSpatialFilterTrainer.dox-part diff --git a/trunk2/core/plugins/boxes/signal-processing-gpl/doc/Doc_BoxAlgorithm_SpectralAnalysisGPL.dox-part b/trunk2/core/plugins/algorithms/signal-processing-gpl/doc/Doc_BoxAlgorithm_SpectralAnalysisGPL.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing-gpl/doc/Doc_BoxAlgorithm_SpectralAnalysisGPL.dox-part rename to trunk2/core/plugins/algorithms/signal-processing-gpl/doc/Doc_BoxAlgorithm_SpectralAnalysisGPL.dox-part diff --git a/trunk2/core/plugins/boxes/signal-processing-gpl/doc/Doc_BoxAlgorithm_XDAWNSpatialFilterTrainer.dox-part b/trunk2/core/plugins/algorithms/signal-processing-gpl/doc/Doc_BoxAlgorithm_XDAWNSpatialFilterTrainer.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing-gpl/doc/Doc_BoxAlgorithm_XDAWNSpatialFilterTrainer.dox-part rename to trunk2/core/plugins/algorithms/signal-processing-gpl/doc/Doc_BoxAlgorithm_XDAWNSpatialFilterTrainer.dox-part diff --git a/trunk2/core/plugins/boxes/signal-processing-gpl/doc/csp_training.png b/trunk2/core/plugins/algorithms/signal-processing-gpl/doc/csp_training.png similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing-gpl/doc/csp_training.png rename to trunk2/core/plugins/algorithms/signal-processing-gpl/doc/csp_training.png diff --git a/trunk2/core/plugins/boxes/signal-processing-gpl/doc/spectralanalysis_online.png b/trunk2/core/plugins/algorithms/signal-processing-gpl/doc/spectralanalysis_online.png similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing-gpl/doc/spectralanalysis_online.png rename to trunk2/core/plugins/algorithms/signal-processing-gpl/doc/spectralanalysis_online.png diff --git a/trunk2/core/plugins/boxes/signal-processing-gpl/src/algorithms/basic/ovpCAlgorithmARBurgMethod.cpp b/trunk2/core/plugins/algorithms/signal-processing-gpl/src/algorithms/basic/ovpCAlgorithmARBurgMethod.cpp similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing-gpl/src/algorithms/basic/ovpCAlgorithmARBurgMethod.cpp rename to trunk2/core/plugins/algorithms/signal-processing-gpl/src/algorithms/basic/ovpCAlgorithmARBurgMethod.cpp diff --git a/trunk2/core/plugins/boxes/signal-processing-gpl/src/algorithms/basic/ovpCAlgorithmARBurgMethod.h b/trunk2/core/plugins/algorithms/signal-processing-gpl/src/algorithms/basic/ovpCAlgorithmARBurgMethod.h similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing-gpl/src/algorithms/basic/ovpCAlgorithmARBurgMethod.h rename to trunk2/core/plugins/algorithms/signal-processing-gpl/src/algorithms/basic/ovpCAlgorithmARBurgMethod.h diff --git a/trunk2/core/plugins/boxes/signal-processing-gpl/src/algorithms/basic/ovpCDetectingMinMax.cpp b/trunk2/core/plugins/algorithms/signal-processing-gpl/src/algorithms/basic/ovpCDetectingMinMax.cpp similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing-gpl/src/algorithms/basic/ovpCDetectingMinMax.cpp rename to trunk2/core/plugins/algorithms/signal-processing-gpl/src/algorithms/basic/ovpCDetectingMinMax.cpp diff --git a/trunk2/core/plugins/boxes/signal-processing-gpl/src/algorithms/basic/ovpCDetectingMinMax.h b/trunk2/core/plugins/algorithms/signal-processing-gpl/src/algorithms/basic/ovpCDetectingMinMax.h similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing-gpl/src/algorithms/basic/ovpCDetectingMinMax.h rename to trunk2/core/plugins/algorithms/signal-processing-gpl/src/algorithms/basic/ovpCDetectingMinMax.h diff --git a/trunk2/core/plugins/boxes/signal-processing-gpl/src/algorithms/basic/ovpCDownsampling.cpp b/trunk2/core/plugins/algorithms/signal-processing-gpl/src/algorithms/basic/ovpCDownsampling.cpp similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing-gpl/src/algorithms/basic/ovpCDownsampling.cpp rename to trunk2/core/plugins/algorithms/signal-processing-gpl/src/algorithms/basic/ovpCDownsampling.cpp diff --git a/trunk2/core/plugins/boxes/signal-processing-gpl/src/algorithms/basic/ovpCDownsampling.h b/trunk2/core/plugins/algorithms/signal-processing-gpl/src/algorithms/basic/ovpCDownsampling.h similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing-gpl/src/algorithms/basic/ovpCDownsampling.h rename to trunk2/core/plugins/algorithms/signal-processing-gpl/src/algorithms/basic/ovpCDownsampling.h diff --git a/trunk2/core/plugins/boxes/signal-processing-gpl/src/algorithms/classif/ovpCApplyFisherLdaFunction.cpp b/trunk2/core/plugins/algorithms/signal-processing-gpl/src/algorithms/classif/ovpCApplyFisherLdaFunction.cpp similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing-gpl/src/algorithms/classif/ovpCApplyFisherLdaFunction.cpp rename to trunk2/core/plugins/algorithms/signal-processing-gpl/src/algorithms/classif/ovpCApplyFisherLdaFunction.cpp diff --git a/trunk2/core/plugins/boxes/signal-processing-gpl/src/algorithms/classif/ovpCApplyFisherLdaFunction.h b/trunk2/core/plugins/algorithms/signal-processing-gpl/src/algorithms/classif/ovpCApplyFisherLdaFunction.h similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing-gpl/src/algorithms/classif/ovpCApplyFisherLdaFunction.h rename to trunk2/core/plugins/algorithms/signal-processing-gpl/src/algorithms/classif/ovpCApplyFisherLdaFunction.h diff --git a/trunk2/core/plugins/boxes/signal-processing-gpl/src/algorithms/classif/ovpCComputeFisherLdaFunction.cpp b/trunk2/core/plugins/algorithms/signal-processing-gpl/src/algorithms/classif/ovpCComputeFisherLdaFunction.cpp similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing-gpl/src/algorithms/classif/ovpCComputeFisherLdaFunction.cpp rename to trunk2/core/plugins/algorithms/signal-processing-gpl/src/algorithms/classif/ovpCComputeFisherLdaFunction.cpp diff --git a/trunk2/core/plugins/boxes/signal-processing-gpl/src/algorithms/classif/ovpCComputeFisherLdaFunction.h b/trunk2/core/plugins/algorithms/signal-processing-gpl/src/algorithms/classif/ovpCComputeFisherLdaFunction.h similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing-gpl/src/algorithms/classif/ovpCComputeFisherLdaFunction.h rename to trunk2/core/plugins/algorithms/signal-processing-gpl/src/algorithms/classif/ovpCComputeFisherLdaFunction.h diff --git a/trunk2/core/plugins/boxes/signal-processing-gpl/src/algorithms/classif/ovpCFeatureExtractionLda.cpp b/trunk2/core/plugins/algorithms/signal-processing-gpl/src/algorithms/classif/ovpCFeatureExtractionLda.cpp similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing-gpl/src/algorithms/classif/ovpCFeatureExtractionLda.cpp rename to trunk2/core/plugins/algorithms/signal-processing-gpl/src/algorithms/classif/ovpCFeatureExtractionLda.cpp diff --git a/trunk2/core/plugins/boxes/signal-processing-gpl/src/algorithms/classif/ovpCFeatureExtractionLda.h b/trunk2/core/plugins/algorithms/signal-processing-gpl/src/algorithms/classif/ovpCFeatureExtractionLda.h similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing-gpl/src/algorithms/classif/ovpCFeatureExtractionLda.h rename to trunk2/core/plugins/algorithms/signal-processing-gpl/src/algorithms/classif/ovpCFeatureExtractionLda.h diff --git a/trunk2/core/plugins/boxes/signal-processing-gpl/src/algorithms/classif/ovpCNaiveBayesApplyFunction.cpp b/trunk2/core/plugins/algorithms/signal-processing-gpl/src/algorithms/classif/ovpCNaiveBayesApplyFunction.cpp similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing-gpl/src/algorithms/classif/ovpCNaiveBayesApplyFunction.cpp rename to trunk2/core/plugins/algorithms/signal-processing-gpl/src/algorithms/classif/ovpCNaiveBayesApplyFunction.cpp diff --git a/trunk2/core/plugins/boxes/signal-processing-gpl/src/algorithms/classif/ovpCNaiveBayesApplyFunction.h b/trunk2/core/plugins/algorithms/signal-processing-gpl/src/algorithms/classif/ovpCNaiveBayesApplyFunction.h similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing-gpl/src/algorithms/classif/ovpCNaiveBayesApplyFunction.h rename to trunk2/core/plugins/algorithms/signal-processing-gpl/src/algorithms/classif/ovpCNaiveBayesApplyFunction.h diff --git a/trunk2/core/plugins/boxes/signal-processing-gpl/src/algorithms/filter/ovpCApplyTemporalFilter.cpp b/trunk2/core/plugins/algorithms/signal-processing-gpl/src/algorithms/filter/ovpCApplyTemporalFilter.cpp similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing-gpl/src/algorithms/filter/ovpCApplyTemporalFilter.cpp rename to trunk2/core/plugins/algorithms/signal-processing-gpl/src/algorithms/filter/ovpCApplyTemporalFilter.cpp diff --git a/trunk2/core/plugins/boxes/signal-processing-gpl/src/algorithms/filter/ovpCApplyTemporalFilter.h b/trunk2/core/plugins/algorithms/signal-processing-gpl/src/algorithms/filter/ovpCApplyTemporalFilter.h similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing-gpl/src/algorithms/filter/ovpCApplyTemporalFilter.h rename to trunk2/core/plugins/algorithms/signal-processing-gpl/src/algorithms/filter/ovpCApplyTemporalFilter.h diff --git a/trunk2/core/plugins/boxes/signal-processing-gpl/src/algorithms/filter/ovpCComputeTemporalFilterCoefficients.cpp b/trunk2/core/plugins/algorithms/signal-processing-gpl/src/algorithms/filter/ovpCComputeTemporalFilterCoefficients.cpp similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing-gpl/src/algorithms/filter/ovpCComputeTemporalFilterCoefficients.cpp rename to trunk2/core/plugins/algorithms/signal-processing-gpl/src/algorithms/filter/ovpCComputeTemporalFilterCoefficients.cpp diff --git a/trunk2/core/plugins/boxes/signal-processing-gpl/src/algorithms/filter/ovpCComputeTemporalFilterCoefficients.h b/trunk2/core/plugins/algorithms/signal-processing-gpl/src/algorithms/filter/ovpCComputeTemporalFilterCoefficients.h similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing-gpl/src/algorithms/filter/ovpCComputeTemporalFilterCoefficients.h rename to trunk2/core/plugins/algorithms/signal-processing-gpl/src/algorithms/filter/ovpCComputeTemporalFilterCoefficients.h diff --git a/trunk2/core/plugins/boxes/signal-processing-gpl/src/box-algorithms/basic/ovpCBoxAlgorithmARFeatures.cpp b/trunk2/core/plugins/algorithms/signal-processing-gpl/src/box-algorithms/basic/ovpCBoxAlgorithmARFeatures.cpp similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing-gpl/src/box-algorithms/basic/ovpCBoxAlgorithmARFeatures.cpp rename to trunk2/core/plugins/algorithms/signal-processing-gpl/src/box-algorithms/basic/ovpCBoxAlgorithmARFeatures.cpp diff --git a/trunk2/core/plugins/boxes/signal-processing-gpl/src/box-algorithms/basic/ovpCBoxAlgorithmARFeatures.h b/trunk2/core/plugins/algorithms/signal-processing-gpl/src/box-algorithms/basic/ovpCBoxAlgorithmARFeatures.h similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing-gpl/src/box-algorithms/basic/ovpCBoxAlgorithmARFeatures.h rename to trunk2/core/plugins/algorithms/signal-processing-gpl/src/box-algorithms/basic/ovpCBoxAlgorithmARFeatures.h diff --git a/trunk2/core/plugins/boxes/signal-processing-gpl/src/box-algorithms/basic/ovpCBoxAlgorithmEnvelope.cpp b/trunk2/core/plugins/algorithms/signal-processing-gpl/src/box-algorithms/basic/ovpCBoxAlgorithmEnvelope.cpp similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing-gpl/src/box-algorithms/basic/ovpCBoxAlgorithmEnvelope.cpp rename to trunk2/core/plugins/algorithms/signal-processing-gpl/src/box-algorithms/basic/ovpCBoxAlgorithmEnvelope.cpp diff --git a/trunk2/core/plugins/boxes/signal-processing-gpl/src/box-algorithms/basic/ovpCBoxAlgorithmEnvelope.h b/trunk2/core/plugins/algorithms/signal-processing-gpl/src/box-algorithms/basic/ovpCBoxAlgorithmEnvelope.h similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing-gpl/src/box-algorithms/basic/ovpCBoxAlgorithmEnvelope.h rename to trunk2/core/plugins/algorithms/signal-processing-gpl/src/box-algorithms/basic/ovpCBoxAlgorithmEnvelope.h diff --git a/trunk2/core/plugins/boxes/signal-processing-gpl/src/box-algorithms/basic/ovpCBoxAlgorithmIFFTbox.cpp b/trunk2/core/plugins/algorithms/signal-processing-gpl/src/box-algorithms/basic/ovpCBoxAlgorithmIFFTbox.cpp similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing-gpl/src/box-algorithms/basic/ovpCBoxAlgorithmIFFTbox.cpp rename to trunk2/core/plugins/algorithms/signal-processing-gpl/src/box-algorithms/basic/ovpCBoxAlgorithmIFFTbox.cpp diff --git a/trunk2/core/plugins/boxes/signal-processing-gpl/src/box-algorithms/basic/ovpCBoxAlgorithmIFFTbox.h b/trunk2/core/plugins/algorithms/signal-processing-gpl/src/box-algorithms/basic/ovpCBoxAlgorithmIFFTbox.h similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing-gpl/src/box-algorithms/basic/ovpCBoxAlgorithmIFFTbox.h rename to trunk2/core/plugins/algorithms/signal-processing-gpl/src/box-algorithms/basic/ovpCBoxAlgorithmIFFTbox.h diff --git a/trunk2/core/plugins/boxes/signal-processing-gpl/src/box-algorithms/basic/ovpCDetectingMinMaxBoxAlgorithm.cpp b/trunk2/core/plugins/algorithms/signal-processing-gpl/src/box-algorithms/basic/ovpCDetectingMinMaxBoxAlgorithm.cpp similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing-gpl/src/box-algorithms/basic/ovpCDetectingMinMaxBoxAlgorithm.cpp rename to trunk2/core/plugins/algorithms/signal-processing-gpl/src/box-algorithms/basic/ovpCDetectingMinMaxBoxAlgorithm.cpp diff --git a/trunk2/core/plugins/boxes/signal-processing-gpl/src/box-algorithms/basic/ovpCDetectingMinMaxBoxAlgorithm.h b/trunk2/core/plugins/algorithms/signal-processing-gpl/src/box-algorithms/basic/ovpCDetectingMinMaxBoxAlgorithm.h similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing-gpl/src/box-algorithms/basic/ovpCDetectingMinMaxBoxAlgorithm.h rename to trunk2/core/plugins/algorithms/signal-processing-gpl/src/box-algorithms/basic/ovpCDetectingMinMaxBoxAlgorithm.h diff --git a/trunk2/core/plugins/boxes/signal-processing-gpl/src/box-algorithms/basic/ovpCDownsamplingBoxAlgorithm.cpp b/trunk2/core/plugins/algorithms/signal-processing-gpl/src/box-algorithms/basic/ovpCDownsamplingBoxAlgorithm.cpp similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing-gpl/src/box-algorithms/basic/ovpCDownsamplingBoxAlgorithm.cpp rename to trunk2/core/plugins/algorithms/signal-processing-gpl/src/box-algorithms/basic/ovpCDownsamplingBoxAlgorithm.cpp diff --git a/trunk2/core/plugins/boxes/signal-processing-gpl/src/box-algorithms/basic/ovpCDownsamplingBoxAlgorithm.h b/trunk2/core/plugins/algorithms/signal-processing-gpl/src/box-algorithms/basic/ovpCDownsamplingBoxAlgorithm.h similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing-gpl/src/box-algorithms/basic/ovpCDownsamplingBoxAlgorithm.h rename to trunk2/core/plugins/algorithms/signal-processing-gpl/src/box-algorithms/basic/ovpCDownsamplingBoxAlgorithm.h diff --git a/trunk2/core/plugins/boxes/signal-processing-gpl/src/box-algorithms/classif/ovpCLDABoxAlgorithm.cpp b/trunk2/core/plugins/algorithms/signal-processing-gpl/src/box-algorithms/classif/ovpCLDABoxAlgorithm.cpp similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing-gpl/src/box-algorithms/classif/ovpCLDABoxAlgorithm.cpp rename to trunk2/core/plugins/algorithms/signal-processing-gpl/src/box-algorithms/classif/ovpCLDABoxAlgorithm.cpp diff --git a/trunk2/core/plugins/boxes/signal-processing-gpl/src/box-algorithms/classif/ovpCLDABoxAlgorithm.h b/trunk2/core/plugins/algorithms/signal-processing-gpl/src/box-algorithms/classif/ovpCLDABoxAlgorithm.h similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing-gpl/src/box-algorithms/classif/ovpCLDABoxAlgorithm.h rename to trunk2/core/plugins/algorithms/signal-processing-gpl/src/box-algorithms/classif/ovpCLDABoxAlgorithm.h diff --git a/trunk2/core/plugins/boxes/signal-processing-gpl/src/box-algorithms/classif/ovpCNaiveBayesApplyBoxAlgorithm.cpp b/trunk2/core/plugins/algorithms/signal-processing-gpl/src/box-algorithms/classif/ovpCNaiveBayesApplyBoxAlgorithm.cpp similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing-gpl/src/box-algorithms/classif/ovpCNaiveBayesApplyBoxAlgorithm.cpp rename to trunk2/core/plugins/algorithms/signal-processing-gpl/src/box-algorithms/classif/ovpCNaiveBayesApplyBoxAlgorithm.cpp diff --git a/trunk2/core/plugins/boxes/signal-processing-gpl/src/box-algorithms/classif/ovpCNaiveBayesApplyBoxAlgorithm.h b/trunk2/core/plugins/algorithms/signal-processing-gpl/src/box-algorithms/classif/ovpCNaiveBayesApplyBoxAlgorithm.h similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing-gpl/src/box-algorithms/classif/ovpCNaiveBayesApplyBoxAlgorithm.h rename to trunk2/core/plugins/algorithms/signal-processing-gpl/src/box-algorithms/classif/ovpCNaiveBayesApplyBoxAlgorithm.h diff --git a/trunk2/core/plugins/boxes/signal-processing-gpl/src/box-algorithms/filter/ovpCBoxAlgorithmCSPSpatialFilterTrainer.cpp b/trunk2/core/plugins/algorithms/signal-processing-gpl/src/box-algorithms/filter/ovpCBoxAlgorithmCSPSpatialFilterTrainer.cpp similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing-gpl/src/box-algorithms/filter/ovpCBoxAlgorithmCSPSpatialFilterTrainer.cpp rename to trunk2/core/plugins/algorithms/signal-processing-gpl/src/box-algorithms/filter/ovpCBoxAlgorithmCSPSpatialFilterTrainer.cpp diff --git a/trunk2/core/plugins/boxes/signal-processing-gpl/src/box-algorithms/filter/ovpCBoxAlgorithmCSPSpatialFilterTrainer.h b/trunk2/core/plugins/algorithms/signal-processing-gpl/src/box-algorithms/filter/ovpCBoxAlgorithmCSPSpatialFilterTrainer.h similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing-gpl/src/box-algorithms/filter/ovpCBoxAlgorithmCSPSpatialFilterTrainer.h rename to trunk2/core/plugins/algorithms/signal-processing-gpl/src/box-algorithms/filter/ovpCBoxAlgorithmCSPSpatialFilterTrainer.h diff --git a/trunk2/core/plugins/boxes/signal-processing-gpl/src/box-algorithms/filter/ovpCBoxAlgorithmXDAWNSpatialFilterTrainer.cpp b/trunk2/core/plugins/algorithms/signal-processing-gpl/src/box-algorithms/filter/ovpCBoxAlgorithmXDAWNSpatialFilterTrainer.cpp similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing-gpl/src/box-algorithms/filter/ovpCBoxAlgorithmXDAWNSpatialFilterTrainer.cpp rename to trunk2/core/plugins/algorithms/signal-processing-gpl/src/box-algorithms/filter/ovpCBoxAlgorithmXDAWNSpatialFilterTrainer.cpp diff --git a/trunk2/core/plugins/boxes/signal-processing-gpl/src/box-algorithms/filter/ovpCBoxAlgorithmXDAWNSpatialFilterTrainer.h b/trunk2/core/plugins/algorithms/signal-processing-gpl/src/box-algorithms/filter/ovpCBoxAlgorithmXDAWNSpatialFilterTrainer.h similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing-gpl/src/box-algorithms/filter/ovpCBoxAlgorithmXDAWNSpatialFilterTrainer.h rename to trunk2/core/plugins/algorithms/signal-processing-gpl/src/box-algorithms/filter/ovpCBoxAlgorithmXDAWNSpatialFilterTrainer.h diff --git a/trunk2/core/plugins/boxes/signal-processing-gpl/src/box-algorithms/filter/ovpCTemporalFilterBoxAlgorithm.cpp b/trunk2/core/plugins/algorithms/signal-processing-gpl/src/box-algorithms/filter/ovpCTemporalFilterBoxAlgorithm.cpp similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing-gpl/src/box-algorithms/filter/ovpCTemporalFilterBoxAlgorithm.cpp rename to trunk2/core/plugins/algorithms/signal-processing-gpl/src/box-algorithms/filter/ovpCTemporalFilterBoxAlgorithm.cpp diff --git a/trunk2/core/plugins/boxes/signal-processing-gpl/src/box-algorithms/filter/ovpCTemporalFilterBoxAlgorithm.h b/trunk2/core/plugins/algorithms/signal-processing-gpl/src/box-algorithms/filter/ovpCTemporalFilterBoxAlgorithm.h similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing-gpl/src/box-algorithms/filter/ovpCTemporalFilterBoxAlgorithm.h rename to trunk2/core/plugins/algorithms/signal-processing-gpl/src/box-algorithms/filter/ovpCTemporalFilterBoxAlgorithm.h diff --git a/trunk2/core/plugins/boxes/signal-processing-gpl/src/box-algorithms/ovpCFastICA.cpp b/trunk2/core/plugins/algorithms/signal-processing-gpl/src/box-algorithms/ovpCFastICA.cpp similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing-gpl/src/box-algorithms/ovpCFastICA.cpp rename to trunk2/core/plugins/algorithms/signal-processing-gpl/src/box-algorithms/ovpCFastICA.cpp diff --git a/trunk2/core/plugins/boxes/signal-processing-gpl/src/box-algorithms/ovpCFastICA.h b/trunk2/core/plugins/algorithms/signal-processing-gpl/src/box-algorithms/ovpCFastICA.h similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing-gpl/src/box-algorithms/ovpCFastICA.h rename to trunk2/core/plugins/algorithms/signal-processing-gpl/src/box-algorithms/ovpCFastICA.h diff --git a/trunk2/core/plugins/boxes/signal-processing-gpl/src/box-algorithms/ovpCSpectralAnalysis.cpp b/trunk2/core/plugins/algorithms/signal-processing-gpl/src/box-algorithms/ovpCSpectralAnalysis.cpp similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing-gpl/src/box-algorithms/ovpCSpectralAnalysis.cpp rename to trunk2/core/plugins/algorithms/signal-processing-gpl/src/box-algorithms/ovpCSpectralAnalysis.cpp diff --git a/trunk2/core/plugins/boxes/signal-processing-gpl/src/box-algorithms/ovpCSpectralAnalysis.h b/trunk2/core/plugins/algorithms/signal-processing-gpl/src/box-algorithms/ovpCSpectralAnalysis.h similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing-gpl/src/box-algorithms/ovpCSpectralAnalysis.h rename to trunk2/core/plugins/algorithms/signal-processing-gpl/src/box-algorithms/ovpCSpectralAnalysis.h diff --git a/trunk2/core/plugins/boxes/signal-processing-gpl/src/box-algorithms/ovpCSpectralAnalysisCospectra.cpp b/trunk2/core/plugins/algorithms/signal-processing-gpl/src/box-algorithms/ovpCSpectralAnalysisCospectra.cpp similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing-gpl/src/box-algorithms/ovpCSpectralAnalysisCospectra.cpp rename to trunk2/core/plugins/algorithms/signal-processing-gpl/src/box-algorithms/ovpCSpectralAnalysisCospectra.cpp diff --git a/trunk2/core/plugins/boxes/signal-processing-gpl/src/box-algorithms/ovpCSpectralAnalysisCospectra.h b/trunk2/core/plugins/algorithms/signal-processing-gpl/src/box-algorithms/ovpCSpectralAnalysisCospectra.h similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing-gpl/src/box-algorithms/ovpCSpectralAnalysisCospectra.h rename to trunk2/core/plugins/algorithms/signal-processing-gpl/src/box-algorithms/ovpCSpectralAnalysisCospectra.h diff --git a/trunk2/core/plugins/boxes/signal-processing-gpl/src/box-algorithms/ovpCTemporalFilter.cpp b/trunk2/core/plugins/algorithms/signal-processing-gpl/src/box-algorithms/ovpCTemporalFilter.cpp similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing-gpl/src/box-algorithms/ovpCTemporalFilter.cpp rename to trunk2/core/plugins/algorithms/signal-processing-gpl/src/box-algorithms/ovpCTemporalFilter.cpp diff --git a/trunk2/core/plugins/boxes/signal-processing-gpl/src/box-algorithms/ovpCTemporalFilter.h b/trunk2/core/plugins/algorithms/signal-processing-gpl/src/box-algorithms/ovpCTemporalFilter.h similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing-gpl/src/box-algorithms/ovpCTemporalFilter.h rename to trunk2/core/plugins/algorithms/signal-processing-gpl/src/box-algorithms/ovpCTemporalFilter.h diff --git a/trunk2/core/plugins/boxes/signal-processing-gpl/src/box-algorithms/ovpCWindowingFunctions.cpp b/trunk2/core/plugins/algorithms/signal-processing-gpl/src/box-algorithms/ovpCWindowingFunctions.cpp similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing-gpl/src/box-algorithms/ovpCWindowingFunctions.cpp rename to trunk2/core/plugins/algorithms/signal-processing-gpl/src/box-algorithms/ovpCWindowingFunctions.cpp diff --git a/trunk2/core/plugins/boxes/signal-processing-gpl/src/box-algorithms/ovpCWindowingFunctions.h b/trunk2/core/plugins/algorithms/signal-processing-gpl/src/box-algorithms/ovpCWindowingFunctions.h similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing-gpl/src/box-algorithms/ovpCWindowingFunctions.h rename to trunk2/core/plugins/algorithms/signal-processing-gpl/src/box-algorithms/ovpCWindowingFunctions.h diff --git a/trunk2/core/plugins/boxes/signal-processing-gpl/src/ovp_defines.h b/trunk2/core/plugins/algorithms/signal-processing-gpl/src/ovp_defines.h similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing-gpl/src/ovp_defines.h rename to trunk2/core/plugins/algorithms/signal-processing-gpl/src/ovp_defines.h diff --git a/trunk2/core/plugins/boxes/signal-processing-gpl/src/ovp_main.cpp b/trunk2/core/plugins/algorithms/signal-processing-gpl/src/ovp_main.cpp similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing-gpl/src/ovp_main.cpp rename to trunk2/core/plugins/algorithms/signal-processing-gpl/src/ovp_main.cpp diff --git a/trunk2/core/plugins/boxes/signal-processing/CMakeLists.txt b/trunk2/core/plugins/algorithms/signal-processing/CMakeLists.txt similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/CMakeLists.txt rename to trunk2/core/plugins/algorithms/signal-processing/CMakeLists.txt diff --git a/trunk2/core/plugins/boxes/signal-processing/doc/Doc_BoxAlgorithm_ChannelRename.dox-part b/trunk2/core/plugins/algorithms/signal-processing/doc/Doc_BoxAlgorithm_ChannelRename.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/doc/Doc_BoxAlgorithm_ChannelRename.dox-part rename to trunk2/core/plugins/algorithms/signal-processing/doc/Doc_BoxAlgorithm_ChannelRename.dox-part diff --git a/trunk2/core/plugins/boxes/signal-processing/doc/Doc_BoxAlgorithm_ChannelSelector.dox-part b/trunk2/core/plugins/algorithms/signal-processing/doc/Doc_BoxAlgorithm_ChannelSelector.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/doc/Doc_BoxAlgorithm_ChannelSelector.dox-part rename to trunk2/core/plugins/algorithms/signal-processing/doc/Doc_BoxAlgorithm_ChannelSelector.dox-part diff --git a/trunk2/core/plugins/boxes/signal-processing/doc/Doc_BoxAlgorithm_ChannelSelectorDeprecated.dox-part b/trunk2/core/plugins/algorithms/signal-processing/doc/Doc_BoxAlgorithm_ChannelSelectorDeprecated.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/doc/Doc_BoxAlgorithm_ChannelSelectorDeprecated.dox-part rename to trunk2/core/plugins/algorithms/signal-processing/doc/Doc_BoxAlgorithm_ChannelSelectorDeprecated.dox-part diff --git a/trunk2/core/plugins/boxes/signal-processing/doc/Doc_BoxAlgorithm_CommonAverageReference.dox-part b/trunk2/core/plugins/algorithms/signal-processing/doc/Doc_BoxAlgorithm_CommonAverageReference.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/doc/Doc_BoxAlgorithm_CommonAverageReference.dox-part rename to trunk2/core/plugins/algorithms/signal-processing/doc/Doc_BoxAlgorithm_CommonAverageReference.dox-part diff --git a/trunk2/core/plugins/boxes/signal-processing/doc/Doc_BoxAlgorithm_Crop.dox-part b/trunk2/core/plugins/algorithms/signal-processing/doc/Doc_BoxAlgorithm_Crop.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/doc/Doc_BoxAlgorithm_Crop.dox-part rename to trunk2/core/plugins/algorithms/signal-processing/doc/Doc_BoxAlgorithm_Crop.dox-part diff --git a/trunk2/core/plugins/boxes/signal-processing/doc/Doc_BoxAlgorithm_EpochAverage.dox-part b/trunk2/core/plugins/algorithms/signal-processing/doc/Doc_BoxAlgorithm_EpochAverage.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/doc/Doc_BoxAlgorithm_EpochAverage.dox-part rename to trunk2/core/plugins/algorithms/signal-processing/doc/Doc_BoxAlgorithm_EpochAverage.dox-part diff --git a/trunk2/core/plugins/boxes/signal-processing/doc/Doc_BoxAlgorithm_FirstDifferenceDetrending.dox-part b/trunk2/core/plugins/algorithms/signal-processing/doc/Doc_BoxAlgorithm_FirstDifferenceDetrending.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/doc/Doc_BoxAlgorithm_FirstDifferenceDetrending.dox-part rename to trunk2/core/plugins/algorithms/signal-processing/doc/Doc_BoxAlgorithm_FirstDifferenceDetrending.dox-part diff --git a/trunk2/core/plugins/boxes/signal-processing/doc/Doc_BoxAlgorithm_FrequencyBandSelector.dox-part b/trunk2/core/plugins/algorithms/signal-processing/doc/Doc_BoxAlgorithm_FrequencyBandSelector.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/doc/Doc_BoxAlgorithm_FrequencyBandSelector.dox-part rename to trunk2/core/plugins/algorithms/signal-processing/doc/Doc_BoxAlgorithm_FrequencyBandSelector.dox-part diff --git a/trunk2/core/plugins/boxes/signal-processing/doc/Doc_BoxAlgorithm_QuadraticForm.dox-part b/trunk2/core/plugins/algorithms/signal-processing/doc/Doc_BoxAlgorithm_QuadraticForm.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/doc/Doc_BoxAlgorithm_QuadraticForm.dox-part rename to trunk2/core/plugins/algorithms/signal-processing/doc/Doc_BoxAlgorithm_QuadraticForm.dox-part diff --git a/trunk2/core/plugins/boxes/signal-processing/doc/Doc_BoxAlgorithm_ReferenceChannel.dox-part b/trunk2/core/plugins/algorithms/signal-processing/doc/Doc_BoxAlgorithm_ReferenceChannel.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/doc/Doc_BoxAlgorithm_ReferenceChannel.dox-part rename to trunk2/core/plugins/algorithms/signal-processing/doc/Doc_BoxAlgorithm_ReferenceChannel.dox-part diff --git a/trunk2/core/plugins/boxes/signal-processing/doc/Doc_BoxAlgorithm_SecondDifferenceDetrending.dox-part b/trunk2/core/plugins/algorithms/signal-processing/doc/Doc_BoxAlgorithm_SecondDifferenceDetrending.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/doc/Doc_BoxAlgorithm_SecondDifferenceDetrending.dox-part rename to trunk2/core/plugins/algorithms/signal-processing/doc/Doc_BoxAlgorithm_SecondDifferenceDetrending.dox-part diff --git a/trunk2/core/plugins/boxes/signal-processing/doc/Doc_BoxAlgorithm_SignalAverage.dox-part b/trunk2/core/plugins/algorithms/signal-processing/doc/Doc_BoxAlgorithm_SignalAverage.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/doc/Doc_BoxAlgorithm_SignalAverage.dox-part rename to trunk2/core/plugins/algorithms/signal-processing/doc/Doc_BoxAlgorithm_SignalAverage.dox-part diff --git a/trunk2/core/plugins/boxes/signal-processing/doc/Doc_BoxAlgorithm_SignalDecimation.dox-part b/trunk2/core/plugins/algorithms/signal-processing/doc/Doc_BoxAlgorithm_SignalDecimation.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/doc/Doc_BoxAlgorithm_SignalDecimation.dox-part rename to trunk2/core/plugins/algorithms/signal-processing/doc/Doc_BoxAlgorithm_SignalDecimation.dox-part diff --git a/trunk2/core/plugins/boxes/signal-processing/doc/Doc_BoxAlgorithm_SignalDifferential_Integral.dox-part b/trunk2/core/plugins/algorithms/signal-processing/doc/Doc_BoxAlgorithm_SignalDifferential_Integral.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/doc/Doc_BoxAlgorithm_SignalDifferential_Integral.dox-part rename to trunk2/core/plugins/algorithms/signal-processing/doc/Doc_BoxAlgorithm_SignalDifferential_Integral.dox-part diff --git a/trunk2/core/plugins/boxes/signal-processing/doc/Doc_BoxAlgorithm_SimpleDSP.dox-part b/trunk2/core/plugins/algorithms/signal-processing/doc/Doc_BoxAlgorithm_SimpleDSP.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/doc/Doc_BoxAlgorithm_SimpleDSP.dox-part rename to trunk2/core/plugins/algorithms/signal-processing/doc/Doc_BoxAlgorithm_SimpleDSP.dox-part diff --git a/trunk2/core/plugins/boxes/signal-processing/doc/Doc_BoxAlgorithm_SpatialFilter.dox-part b/trunk2/core/plugins/algorithms/signal-processing/doc/Doc_BoxAlgorithm_SpatialFilter.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/doc/Doc_BoxAlgorithm_SpatialFilter.dox-part rename to trunk2/core/plugins/algorithms/signal-processing/doc/Doc_BoxAlgorithm_SpatialFilter.dox-part diff --git a/trunk2/core/plugins/boxes/signal-processing/doc/Doc_BoxAlgorithm_SpectrumAverage.dox-part b/trunk2/core/plugins/algorithms/signal-processing/doc/Doc_BoxAlgorithm_SpectrumAverage.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/doc/Doc_BoxAlgorithm_SpectrumAverage.dox-part rename to trunk2/core/plugins/algorithms/signal-processing/doc/Doc_BoxAlgorithm_SpectrumAverage.dox-part diff --git a/trunk2/core/plugins/boxes/signal-processing/doc/Doc_BoxAlgorithm_StimulationBasedEpoching.dox-part b/trunk2/core/plugins/algorithms/signal-processing/doc/Doc_BoxAlgorithm_StimulationBasedEpoching.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/doc/Doc_BoxAlgorithm_StimulationBasedEpoching.dox-part rename to trunk2/core/plugins/algorithms/signal-processing/doc/Doc_BoxAlgorithm_StimulationBasedEpoching.dox-part diff --git a/trunk2/core/plugins/boxes/signal-processing/doc/Doc_BoxAlgorithm_StreamSynchronization.dox-part b/trunk2/core/plugins/algorithms/signal-processing/doc/Doc_BoxAlgorithm_StreamSynchronization.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/doc/Doc_BoxAlgorithm_StreamSynchronization.dox-part rename to trunk2/core/plugins/algorithms/signal-processing/doc/Doc_BoxAlgorithm_StreamSynchronization.dox-part diff --git a/trunk2/core/plugins/boxes/signal-processing/doc/Doc_BoxAlgorithm_TimeBasedEpoching.dox-part b/trunk2/core/plugins/algorithms/signal-processing/doc/Doc_BoxAlgorithm_TimeBasedEpoching.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/doc/Doc_BoxAlgorithm_TimeBasedEpoching.dox-part rename to trunk2/core/plugins/algorithms/signal-processing/doc/Doc_BoxAlgorithm_TimeBasedEpoching.dox-part diff --git a/trunk2/core/plugins/boxes/signal-processing/doc/Doc_BoxAlgorithm_UnivariateStatistics.dox-part b/trunk2/core/plugins/algorithms/signal-processing/doc/Doc_BoxAlgorithm_UnivariateStatistics.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/doc/Doc_BoxAlgorithm_UnivariateStatistics.dox-part rename to trunk2/core/plugins/algorithms/signal-processing/doc/Doc_BoxAlgorithm_UnivariateStatistics.dox-part diff --git a/trunk2/core/plugins/boxes/signal-processing/doc/timebasedepoching_1.png b/trunk2/core/plugins/algorithms/signal-processing/doc/timebasedepoching_1.png similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/doc/timebasedepoching_1.png rename to trunk2/core/plugins/algorithms/signal-processing/doc/timebasedepoching_1.png diff --git a/trunk2/core/plugins/boxes/signal-processing/doc/timebasedepoching_2.png b/trunk2/core/plugins/algorithms/signal-processing/doc/timebasedepoching_2.png similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/doc/timebasedepoching_2.png rename to trunk2/core/plugins/algorithms/signal-processing/doc/timebasedepoching_2.png diff --git a/trunk2/core/plugins/boxes/signal-processing/doc/timebasedepoching_3.png b/trunk2/core/plugins/algorithms/signal-processing/doc/timebasedepoching_3.png similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/doc/timebasedepoching_3.png rename to trunk2/core/plugins/algorithms/signal-processing/doc/timebasedepoching_3.png diff --git a/trunk2/core/plugins/boxes/signal-processing/src/algorithms/basic/ovpCMatrixAverage.cpp b/trunk2/core/plugins/algorithms/signal-processing/src/algorithms/basic/ovpCMatrixAverage.cpp similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/algorithms/basic/ovpCMatrixAverage.cpp rename to trunk2/core/plugins/algorithms/signal-processing/src/algorithms/basic/ovpCMatrixAverage.cpp diff --git a/trunk2/core/plugins/boxes/signal-processing/src/algorithms/basic/ovpCMatrixAverage.h b/trunk2/core/plugins/algorithms/signal-processing/src/algorithms/basic/ovpCMatrixAverage.h similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/algorithms/basic/ovpCMatrixAverage.h rename to trunk2/core/plugins/algorithms/signal-processing/src/algorithms/basic/ovpCMatrixAverage.h diff --git a/trunk2/core/plugins/boxes/signal-processing/src/algorithms/epoching/ovpCAlgorithmStimulationBasedEpoching.cpp b/trunk2/core/plugins/algorithms/signal-processing/src/algorithms/epoching/ovpCAlgorithmStimulationBasedEpoching.cpp similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/algorithms/epoching/ovpCAlgorithmStimulationBasedEpoching.cpp rename to trunk2/core/plugins/algorithms/signal-processing/src/algorithms/epoching/ovpCAlgorithmStimulationBasedEpoching.cpp diff --git a/trunk2/core/plugins/boxes/signal-processing/src/algorithms/epoching/ovpCAlgorithmStimulationBasedEpoching.h b/trunk2/core/plugins/algorithms/signal-processing/src/algorithms/epoching/ovpCAlgorithmStimulationBasedEpoching.h similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/algorithms/epoching/ovpCAlgorithmStimulationBasedEpoching.h rename to trunk2/core/plugins/algorithms/signal-processing/src/algorithms/epoching/ovpCAlgorithmStimulationBasedEpoching.h diff --git a/trunk2/core/plugins/boxes/signal-processing/src/algorithms/filters/ovpCApplySpatialFilter.cpp b/trunk2/core/plugins/algorithms/signal-processing/src/algorithms/filters/ovpCApplySpatialFilter.cpp similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/algorithms/filters/ovpCApplySpatialFilter.cpp rename to trunk2/core/plugins/algorithms/signal-processing/src/algorithms/filters/ovpCApplySpatialFilter.cpp diff --git a/trunk2/core/plugins/boxes/signal-processing/src/algorithms/filters/ovpCApplySpatialFilter.h b/trunk2/core/plugins/algorithms/signal-processing/src/algorithms/filters/ovpCApplySpatialFilter.h similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/algorithms/filters/ovpCApplySpatialFilter.h rename to trunk2/core/plugins/algorithms/signal-processing/src/algorithms/filters/ovpCApplySpatialFilter.h diff --git a/trunk2/core/plugins/boxes/signal-processing/src/algorithms/ovpCAlgorithmUnivariateStatistics.cpp b/trunk2/core/plugins/algorithms/signal-processing/src/algorithms/ovpCAlgorithmUnivariateStatistics.cpp similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/algorithms/ovpCAlgorithmUnivariateStatistics.cpp rename to trunk2/core/plugins/algorithms/signal-processing/src/algorithms/ovpCAlgorithmUnivariateStatistics.cpp diff --git a/trunk2/core/plugins/boxes/signal-processing/src/algorithms/ovpCAlgorithmUnivariateStatistics.h b/trunk2/core/plugins/algorithms/signal-processing/src/algorithms/ovpCAlgorithmUnivariateStatistics.h similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/algorithms/ovpCAlgorithmUnivariateStatistics.h rename to trunk2/core/plugins/algorithms/signal-processing/src/algorithms/ovpCAlgorithmUnivariateStatistics.h diff --git a/trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmChannelRename.cpp b/trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmChannelRename.cpp similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmChannelRename.cpp rename to trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmChannelRename.cpp diff --git a/trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmChannelRename.h b/trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmChannelRename.h similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmChannelRename.h rename to trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmChannelRename.h diff --git a/trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmChannelSelector.cpp b/trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmChannelSelector.cpp similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmChannelSelector.cpp rename to trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmChannelSelector.cpp diff --git a/trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmChannelSelector.h b/trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmChannelSelector.h similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmChannelSelector.h rename to trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmChannelSelector.h diff --git a/trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmCrop.cpp b/trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmCrop.cpp similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmCrop.cpp rename to trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmCrop.cpp diff --git a/trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmCrop.h b/trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmCrop.h similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmCrop.h rename to trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmCrop.h diff --git a/trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmDifferentialIntegral.cpp b/trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmDifferentialIntegral.cpp similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmDifferentialIntegral.cpp rename to trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmDifferentialIntegral.cpp diff --git a/trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmDifferentialIntegral.h b/trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmDifferentialIntegral.h similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmDifferentialIntegral.h rename to trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmDifferentialIntegral.h diff --git a/trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmEpochAverage.cpp b/trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmEpochAverage.cpp similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmEpochAverage.cpp rename to trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmEpochAverage.cpp diff --git a/trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmEpochAverage.h b/trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmEpochAverage.h similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmEpochAverage.h rename to trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmEpochAverage.h diff --git a/trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmReferenceChannel.cpp b/trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmReferenceChannel.cpp similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmReferenceChannel.cpp rename to trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmReferenceChannel.cpp diff --git a/trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmReferenceChannel.h b/trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmReferenceChannel.h similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmReferenceChannel.h rename to trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmReferenceChannel.h diff --git a/trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmSignalDecimation.cpp b/trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmSignalDecimation.cpp similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmSignalDecimation.cpp rename to trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmSignalDecimation.cpp diff --git a/trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmSignalDecimation.h b/trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmSignalDecimation.h similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmSignalDecimation.h rename to trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmSignalDecimation.h diff --git a/trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmSynchro.cpp b/trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmSynchro.cpp similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmSynchro.cpp rename to trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmSynchro.cpp diff --git a/trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmSynchro.h b/trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmSynchro.h similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmSynchro.h rename to trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmSynchro.h diff --git a/trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/basic/ovpCInputChannel.cpp b/trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/basic/ovpCInputChannel.cpp similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/basic/ovpCInputChannel.cpp rename to trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/basic/ovpCInputChannel.cpp diff --git a/trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/basic/ovpCInputChannel.h b/trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/basic/ovpCInputChannel.h similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/basic/ovpCInputChannel.h rename to trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/basic/ovpCInputChannel.h diff --git a/trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/basic/ovpCOutputChannel.cpp b/trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/basic/ovpCOutputChannel.cpp similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/basic/ovpCOutputChannel.cpp rename to trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/basic/ovpCOutputChannel.cpp diff --git a/trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/basic/ovpCOutputChannel.h b/trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/basic/ovpCOutputChannel.h similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/basic/ovpCOutputChannel.h rename to trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/basic/ovpCOutputChannel.h diff --git a/trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/epoching/ovpCBoxAlgorithmStimulationBasedEpoching.cpp b/trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/epoching/ovpCBoxAlgorithmStimulationBasedEpoching.cpp similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/epoching/ovpCBoxAlgorithmStimulationBasedEpoching.cpp rename to trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/epoching/ovpCBoxAlgorithmStimulationBasedEpoching.cpp diff --git a/trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/epoching/ovpCBoxAlgorithmStimulationBasedEpoching.h b/trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/epoching/ovpCBoxAlgorithmStimulationBasedEpoching.h similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/epoching/ovpCBoxAlgorithmStimulationBasedEpoching.h rename to trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/epoching/ovpCBoxAlgorithmStimulationBasedEpoching.h diff --git a/trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/filters/ovpCBoxAlgorithmCommonAverageReference.cpp b/trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/filters/ovpCBoxAlgorithmCommonAverageReference.cpp similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/filters/ovpCBoxAlgorithmCommonAverageReference.cpp rename to trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/filters/ovpCBoxAlgorithmCommonAverageReference.cpp diff --git a/trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/filters/ovpCBoxAlgorithmCommonAverageReference.h b/trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/filters/ovpCBoxAlgorithmCommonAverageReference.h similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/filters/ovpCBoxAlgorithmCommonAverageReference.h rename to trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/filters/ovpCBoxAlgorithmCommonAverageReference.h diff --git a/trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/filters/ovpCBoxAlgorithmSpatialFilter.cpp b/trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/filters/ovpCBoxAlgorithmSpatialFilter.cpp similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/filters/ovpCBoxAlgorithmSpatialFilter.cpp rename to trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/filters/ovpCBoxAlgorithmSpatialFilter.cpp diff --git a/trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/filters/ovpCBoxAlgorithmSpatialFilter.h b/trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/filters/ovpCBoxAlgorithmSpatialFilter.h similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/filters/ovpCBoxAlgorithmSpatialFilter.h rename to trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/filters/ovpCBoxAlgorithmSpatialFilter.h diff --git a/trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/filters/ovpCSpatialFilterBoxAlgorithm.cpp b/trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/filters/ovpCSpatialFilterBoxAlgorithm.cpp similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/filters/ovpCSpatialFilterBoxAlgorithm.cpp rename to trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/filters/ovpCSpatialFilterBoxAlgorithm.cpp diff --git a/trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/filters/ovpCSpatialFilterBoxAlgorithm.h b/trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/filters/ovpCSpatialFilterBoxAlgorithm.h similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/filters/ovpCSpatialFilterBoxAlgorithm.h rename to trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/filters/ovpCSpatialFilterBoxAlgorithm.h diff --git a/trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/ovpCBandFrequencyAverage.cpp b/trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/ovpCBandFrequencyAverage.cpp similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/ovpCBandFrequencyAverage.cpp rename to trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/ovpCBandFrequencyAverage.cpp diff --git a/trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/ovpCBandFrequencyAverage.h b/trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/ovpCBandFrequencyAverage.h similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/ovpCBandFrequencyAverage.h rename to trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/ovpCBandFrequencyAverage.h diff --git a/trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/ovpCBoxAlgorithmQuadraticForm.cpp b/trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/ovpCBoxAlgorithmQuadraticForm.cpp similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/ovpCBoxAlgorithmQuadraticForm.cpp rename to trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/ovpCBoxAlgorithmQuadraticForm.cpp diff --git a/trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/ovpCBoxAlgorithmQuadraticForm.h b/trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/ovpCBoxAlgorithmQuadraticForm.h similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/ovpCBoxAlgorithmQuadraticForm.h rename to trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/ovpCBoxAlgorithmQuadraticForm.h diff --git a/trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/ovpCBoxAlgorithmUnivariateStatistics.cpp b/trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/ovpCBoxAlgorithmUnivariateStatistics.cpp similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/ovpCBoxAlgorithmUnivariateStatistics.cpp rename to trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/ovpCBoxAlgorithmUnivariateStatistics.cpp diff --git a/trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/ovpCBoxAlgorithmUnivariateStatistics.h b/trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/ovpCBoxAlgorithmUnivariateStatistics.h similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/ovpCBoxAlgorithmUnivariateStatistics.h rename to trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/ovpCBoxAlgorithmUnivariateStatistics.h diff --git a/trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/ovpCChannelSelector.cpp b/trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/ovpCChannelSelector.cpp similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/ovpCChannelSelector.cpp rename to trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/ovpCChannelSelector.cpp diff --git a/trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/ovpCChannelSelector.h b/trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/ovpCChannelSelector.h similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/ovpCChannelSelector.h rename to trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/ovpCChannelSelector.h diff --git a/trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/ovpCEpoching.cpp b/trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/ovpCEpoching.cpp similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/ovpCEpoching.cpp rename to trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/ovpCEpoching.cpp diff --git a/trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/ovpCEpoching.h b/trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/ovpCEpoching.h similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/ovpCEpoching.h rename to trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/ovpCEpoching.h diff --git a/trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/ovpCFirstDifferenceDetrending.cpp b/trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/ovpCFirstDifferenceDetrending.cpp similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/ovpCFirstDifferenceDetrending.cpp rename to trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/ovpCFirstDifferenceDetrending.cpp diff --git a/trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/ovpCFirstDifferenceDetrending.h b/trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/ovpCFirstDifferenceDetrending.h similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/ovpCFirstDifferenceDetrending.h rename to trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/ovpCFirstDifferenceDetrending.h diff --git a/trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/ovpCReferenceChannel.cpp b/trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/ovpCReferenceChannel.cpp similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/ovpCReferenceChannel.cpp rename to trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/ovpCReferenceChannel.cpp diff --git a/trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/ovpCReferenceChannel.h b/trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/ovpCReferenceChannel.h similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/ovpCReferenceChannel.h rename to trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/ovpCReferenceChannel.h diff --git a/trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/ovpCSecondDifferenceDetrending.cpp b/trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/ovpCSecondDifferenceDetrending.cpp similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/ovpCSecondDifferenceDetrending.cpp rename to trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/ovpCSecondDifferenceDetrending.cpp diff --git a/trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/ovpCSecondDifferenceDetrending.h b/trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/ovpCSecondDifferenceDetrending.h similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/ovpCSecondDifferenceDetrending.h rename to trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/ovpCSecondDifferenceDetrending.h diff --git a/trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/ovpCSignalAverage.cpp b/trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/ovpCSignalAverage.cpp similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/ovpCSignalAverage.cpp rename to trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/ovpCSignalAverage.cpp diff --git a/trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/ovpCSignalAverage.h b/trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/ovpCSignalAverage.h similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/ovpCSignalAverage.h rename to trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/ovpCSignalAverage.h diff --git a/trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/ovpCSignalConcat.cpp b/trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/ovpCSignalConcat.cpp similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/ovpCSignalConcat.cpp rename to trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/ovpCSignalConcat.cpp diff --git a/trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/ovpCSignalConcat.h b/trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/ovpCSignalConcat.h similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/ovpCSignalConcat.h rename to trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/ovpCSignalConcat.h diff --git a/trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/ovpCSimpleDSP.cpp b/trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/ovpCSimpleDSP.cpp similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/ovpCSimpleDSP.cpp rename to trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/ovpCSimpleDSP.cpp diff --git a/trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/ovpCSimpleDSP.h b/trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/ovpCSimpleDSP.h similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/ovpCSimpleDSP.h rename to trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/ovpCSimpleDSP.h diff --git a/trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/ovpCSteadyStateFrequencyComparison.cpp b/trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/ovpCSteadyStateFrequencyComparison.cpp similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/ovpCSteadyStateFrequencyComparison.cpp rename to trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/ovpCSteadyStateFrequencyComparison.cpp diff --git a/trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/ovpCSteadyStateFrequencyComparison.h b/trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/ovpCSteadyStateFrequencyComparison.h similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/ovpCSteadyStateFrequencyComparison.h rename to trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/ovpCSteadyStateFrequencyComparison.h diff --git a/trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/ovpCTimeBasedEpoching.cpp b/trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/ovpCTimeBasedEpoching.cpp similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/ovpCTimeBasedEpoching.cpp rename to trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/ovpCTimeBasedEpoching.cpp diff --git a/trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/ovpCTimeBasedEpoching.h b/trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/ovpCTimeBasedEpoching.h similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/ovpCTimeBasedEpoching.h rename to trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/ovpCTimeBasedEpoching.h diff --git a/trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/spectral-analysis/ovpCBoxAlgorithmFrequencyBandSelector.cpp b/trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/spectral-analysis/ovpCBoxAlgorithmFrequencyBandSelector.cpp similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/spectral-analysis/ovpCBoxAlgorithmFrequencyBandSelector.cpp rename to trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/spectral-analysis/ovpCBoxAlgorithmFrequencyBandSelector.cpp diff --git a/trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/spectral-analysis/ovpCBoxAlgorithmFrequencyBandSelector.h b/trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/spectral-analysis/ovpCBoxAlgorithmFrequencyBandSelector.h similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/spectral-analysis/ovpCBoxAlgorithmFrequencyBandSelector.h rename to trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/spectral-analysis/ovpCBoxAlgorithmFrequencyBandSelector.h diff --git a/trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/spectral-analysis/ovpCBoxAlgorithmSpectrumAverage.cpp b/trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/spectral-analysis/ovpCBoxAlgorithmSpectrumAverage.cpp similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/spectral-analysis/ovpCBoxAlgorithmSpectrumAverage.cpp rename to trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/spectral-analysis/ovpCBoxAlgorithmSpectrumAverage.cpp diff --git a/trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/spectral-analysis/ovpCBoxAlgorithmSpectrumAverage.h b/trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/spectral-analysis/ovpCBoxAlgorithmSpectrumAverage.h similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/box-algorithms/spectral-analysis/ovpCBoxAlgorithmSpectrumAverage.h rename to trunk2/core/plugins/algorithms/signal-processing/src/box-algorithms/spectral-analysis/ovpCBoxAlgorithmSpectrumAverage.h diff --git a/trunk2/core/plugins/boxes/signal-processing/src/ovpCSimpleDSP/ovpCAbstractTree.cpp b/trunk2/core/plugins/algorithms/signal-processing/src/ovpCSimpleDSP/ovpCAbstractTree.cpp similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/ovpCSimpleDSP/ovpCAbstractTree.cpp rename to trunk2/core/plugins/algorithms/signal-processing/src/ovpCSimpleDSP/ovpCAbstractTree.cpp diff --git a/trunk2/core/plugins/boxes/signal-processing/src/ovpCSimpleDSP/ovpCAbstractTree.h b/trunk2/core/plugins/algorithms/signal-processing/src/ovpCSimpleDSP/ovpCAbstractTree.h similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/ovpCSimpleDSP/ovpCAbstractTree.h rename to trunk2/core/plugins/algorithms/signal-processing/src/ovpCSimpleDSP/ovpCAbstractTree.h diff --git a/trunk2/core/plugins/boxes/signal-processing/src/ovpCSimpleDSP/ovpCEquationParser.cpp b/trunk2/core/plugins/algorithms/signal-processing/src/ovpCSimpleDSP/ovpCEquationParser.cpp similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/ovpCSimpleDSP/ovpCEquationParser.cpp rename to trunk2/core/plugins/algorithms/signal-processing/src/ovpCSimpleDSP/ovpCEquationParser.cpp diff --git a/trunk2/core/plugins/boxes/signal-processing/src/ovpCSimpleDSP/ovpCEquationParser.h b/trunk2/core/plugins/algorithms/signal-processing/src/ovpCSimpleDSP/ovpCEquationParser.h similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/ovpCSimpleDSP/ovpCEquationParser.h rename to trunk2/core/plugins/algorithms/signal-processing/src/ovpCSimpleDSP/ovpCEquationParser.h diff --git a/trunk2/core/plugins/boxes/signal-processing/src/ovpCSimpleDSP/ovpCEquationParserGrammar.h b/trunk2/core/plugins/algorithms/signal-processing/src/ovpCSimpleDSP/ovpCEquationParserGrammar.h similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/ovpCSimpleDSP/ovpCEquationParserGrammar.h rename to trunk2/core/plugins/algorithms/signal-processing/src/ovpCSimpleDSP/ovpCEquationParserGrammar.h diff --git a/trunk2/core/plugins/boxes/signal-processing/src/ovp_defines.h b/trunk2/core/plugins/algorithms/signal-processing/src/ovp_defines.h similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/ovp_defines.h rename to trunk2/core/plugins/algorithms/signal-processing/src/ovp_defines.h diff --git a/trunk2/core/plugins/boxes/signal-processing/src/ovp_main.cpp b/trunk2/core/plugins/algorithms/signal-processing/src/ovp_main.cpp similarity index 100% rename from trunk2/core/plugins/boxes/signal-processing/src/ovp_main.cpp rename to trunk2/core/plugins/algorithms/signal-processing/src/ovp_main.cpp diff --git a/trunk2/core/plugins/boxes/simple-visualisation/CMakeLists.txt b/trunk2/core/plugins/algorithms/simple-visualisation/CMakeLists.txt similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/CMakeLists.txt rename to trunk2/core/plugins/algorithms/simple-visualisation/CMakeLists.txt diff --git a/trunk2/core/plugins/boxes/simple-visualisation/doc/Doc_BoxAlgorithm_2DTopographicMap.dox-part b/trunk2/core/plugins/algorithms/simple-visualisation/doc/Doc_BoxAlgorithm_2DTopographicMap.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/doc/Doc_BoxAlgorithm_2DTopographicMap.dox-part rename to trunk2/core/plugins/algorithms/simple-visualisation/doc/Doc_BoxAlgorithm_2DTopographicMap.dox-part diff --git a/trunk2/core/plugins/boxes/simple-visualisation/doc/Doc_BoxAlgorithm_3DTopographicMap.dox-part b/trunk2/core/plugins/algorithms/simple-visualisation/doc/Doc_BoxAlgorithm_3DTopographicMap.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/doc/Doc_BoxAlgorithm_3DTopographicMap.dox-part rename to trunk2/core/plugins/algorithms/simple-visualisation/doc/Doc_BoxAlgorithm_3DTopographicMap.dox-part diff --git a/trunk2/core/plugins/boxes/simple-visualisation/doc/Doc_BoxAlgorithm_ClassifierAccuracyMeasure.dox-part b/trunk2/core/plugins/algorithms/simple-visualisation/doc/Doc_BoxAlgorithm_ClassifierAccuracyMeasure.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/doc/Doc_BoxAlgorithm_ClassifierAccuracyMeasure.dox-part rename to trunk2/core/plugins/algorithms/simple-visualisation/doc/Doc_BoxAlgorithm_ClassifierAccuracyMeasure.dox-part diff --git a/trunk2/core/plugins/boxes/simple-visualisation/doc/Doc_BoxAlgorithm_DisplayCueImage.dox-part b/trunk2/core/plugins/algorithms/simple-visualisation/doc/Doc_BoxAlgorithm_DisplayCueImage.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/doc/Doc_BoxAlgorithm_DisplayCueImage.dox-part rename to trunk2/core/plugins/algorithms/simple-visualisation/doc/Doc_BoxAlgorithm_DisplayCueImage.dox-part diff --git a/trunk2/core/plugins/boxes/simple-visualisation/doc/Doc_BoxAlgorithm_GrazVisualization.dox-part b/trunk2/core/plugins/algorithms/simple-visualisation/doc/Doc_BoxAlgorithm_GrazVisualization.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/doc/Doc_BoxAlgorithm_GrazVisualization.dox-part rename to trunk2/core/plugins/algorithms/simple-visualisation/doc/Doc_BoxAlgorithm_GrazVisualization.dox-part diff --git a/trunk2/core/plugins/boxes/simple-visualisation/doc/Doc_BoxAlgorithm_LevelMeasure.dox-part b/trunk2/core/plugins/algorithms/simple-visualisation/doc/Doc_BoxAlgorithm_LevelMeasure.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/doc/Doc_BoxAlgorithm_LevelMeasure.dox-part rename to trunk2/core/plugins/algorithms/simple-visualisation/doc/Doc_BoxAlgorithm_LevelMeasure.dox-part diff --git a/trunk2/core/plugins/boxes/simple-visualisation/doc/Doc_BoxAlgorithm_MatrixDisplay.dox-part b/trunk2/core/plugins/algorithms/simple-visualisation/doc/Doc_BoxAlgorithm_MatrixDisplay.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/doc/Doc_BoxAlgorithm_MatrixDisplay.dox-part rename to trunk2/core/plugins/algorithms/simple-visualisation/doc/Doc_BoxAlgorithm_MatrixDisplay.dox-part diff --git a/trunk2/core/plugins/boxes/simple-visualisation/doc/Doc_BoxAlgorithm_P300IdentifierCardVisualisation.dox-part b/trunk2/core/plugins/algorithms/simple-visualisation/doc/Doc_BoxAlgorithm_P300IdentifierCardVisualisation.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/doc/Doc_BoxAlgorithm_P300IdentifierCardVisualisation.dox-part rename to trunk2/core/plugins/algorithms/simple-visualisation/doc/Doc_BoxAlgorithm_P300IdentifierCardVisualisation.dox-part diff --git a/trunk2/core/plugins/boxes/simple-visualisation/doc/Doc_BoxAlgorithm_P300IdentifierCardVisualisation_Snapshot.png b/trunk2/core/plugins/algorithms/simple-visualisation/doc/Doc_BoxAlgorithm_P300IdentifierCardVisualisation_Snapshot.png similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/doc/Doc_BoxAlgorithm_P300IdentifierCardVisualisation_Snapshot.png rename to trunk2/core/plugins/algorithms/simple-visualisation/doc/Doc_BoxAlgorithm_P300IdentifierCardVisualisation_Snapshot.png diff --git a/trunk2/core/plugins/boxes/simple-visualisation/doc/Doc_BoxAlgorithm_P300MagicCardVisualisation.dox-part b/trunk2/core/plugins/algorithms/simple-visualisation/doc/Doc_BoxAlgorithm_P300MagicCardVisualisation.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/doc/Doc_BoxAlgorithm_P300MagicCardVisualisation.dox-part rename to trunk2/core/plugins/algorithms/simple-visualisation/doc/Doc_BoxAlgorithm_P300MagicCardVisualisation.dox-part diff --git a/trunk2/core/plugins/boxes/simple-visualisation/doc/Doc_BoxAlgorithm_P300MagicCardVisualisation_Snapshot1.png b/trunk2/core/plugins/algorithms/simple-visualisation/doc/Doc_BoxAlgorithm_P300MagicCardVisualisation_Snapshot1.png similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/doc/Doc_BoxAlgorithm_P300MagicCardVisualisation_Snapshot1.png rename to trunk2/core/plugins/algorithms/simple-visualisation/doc/Doc_BoxAlgorithm_P300MagicCardVisualisation_Snapshot1.png diff --git a/trunk2/core/plugins/boxes/simple-visualisation/doc/Doc_BoxAlgorithm_P300MagicCardVisualisation_Snapshot2.png b/trunk2/core/plugins/algorithms/simple-visualisation/doc/Doc_BoxAlgorithm_P300MagicCardVisualisation_Snapshot2.png similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/doc/Doc_BoxAlgorithm_P300MagicCardVisualisation_Snapshot2.png rename to trunk2/core/plugins/algorithms/simple-visualisation/doc/Doc_BoxAlgorithm_P300MagicCardVisualisation_Snapshot2.png diff --git a/trunk2/core/plugins/boxes/simple-visualisation/doc/Doc_BoxAlgorithm_P300SpellerVisualisation.dox-part b/trunk2/core/plugins/algorithms/simple-visualisation/doc/Doc_BoxAlgorithm_P300SpellerVisualisation.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/doc/Doc_BoxAlgorithm_P300SpellerVisualisation.dox-part rename to trunk2/core/plugins/algorithms/simple-visualisation/doc/Doc_BoxAlgorithm_P300SpellerVisualisation.dox-part diff --git a/trunk2/core/plugins/boxes/simple-visualisation/doc/Doc_BoxAlgorithm_P300SpellerVisualisation_Snapshot.png b/trunk2/core/plugins/algorithms/simple-visualisation/doc/Doc_BoxAlgorithm_P300SpellerVisualisation_Snapshot.png similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/doc/Doc_BoxAlgorithm_P300SpellerVisualisation_Snapshot.png rename to trunk2/core/plugins/algorithms/simple-visualisation/doc/Doc_BoxAlgorithm_P300SpellerVisualisation_Snapshot.png diff --git a/trunk2/core/plugins/boxes/simple-visualisation/doc/Doc_BoxAlgorithm_PowerSpectrumDisplay.dox-part b/trunk2/core/plugins/algorithms/simple-visualisation/doc/Doc_BoxAlgorithm_PowerSpectrumDisplay.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/doc/Doc_BoxAlgorithm_PowerSpectrumDisplay.dox-part rename to trunk2/core/plugins/algorithms/simple-visualisation/doc/Doc_BoxAlgorithm_PowerSpectrumDisplay.dox-part diff --git a/trunk2/core/plugins/boxes/simple-visualisation/doc/Doc_BoxAlgorithm_SignalDisplay.dox-part b/trunk2/core/plugins/algorithms/simple-visualisation/doc/Doc_BoxAlgorithm_SignalDisplay.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/doc/Doc_BoxAlgorithm_SignalDisplay.dox-part rename to trunk2/core/plugins/algorithms/simple-visualisation/doc/Doc_BoxAlgorithm_SignalDisplay.dox-part diff --git a/trunk2/core/plugins/boxes/simple-visualisation/doc/Doc_BoxAlgorithm_Simple3DViewer.dox-part b/trunk2/core/plugins/algorithms/simple-visualisation/doc/Doc_BoxAlgorithm_Simple3DViewer.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/doc/Doc_BoxAlgorithm_Simple3DViewer.dox-part rename to trunk2/core/plugins/algorithms/simple-visualisation/doc/Doc_BoxAlgorithm_Simple3DViewer.dox-part diff --git a/trunk2/core/plugins/boxes/simple-visualisation/doc/Doc_BoxAlgorithm_TimeFrequencyMapDisplay.dox-part b/trunk2/core/plugins/algorithms/simple-visualisation/doc/Doc_BoxAlgorithm_TimeFrequencyMapDisplay.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/doc/Doc_BoxAlgorithm_TimeFrequencyMapDisplay.dox-part rename to trunk2/core/plugins/algorithms/simple-visualisation/doc/Doc_BoxAlgorithm_TimeFrequencyMapDisplay.dox-part diff --git a/trunk2/core/plugins/boxes/simple-visualisation/doc/Doc_BoxAlgorithm_VoxelDisplay.dox-part b/trunk2/core/plugins/algorithms/simple-visualisation/doc/Doc_BoxAlgorithm_VoxelDisplay.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/doc/Doc_BoxAlgorithm_VoxelDisplay.dox-part rename to trunk2/core/plugins/algorithms/simple-visualisation/doc/Doc_BoxAlgorithm_VoxelDisplay.dox-part diff --git a/trunk2/core/plugins/boxes/simple-visualisation/doc/matrix_display_online.png b/trunk2/core/plugins/algorithms/simple-visualisation/doc/matrix_display_online.png similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/doc/matrix_display_online.png rename to trunk2/core/plugins/algorithms/simple-visualisation/doc/matrix_display_online.png diff --git a/trunk2/core/plugins/boxes/simple-visualisation/doc/powerspectrumdisplay_online.png b/trunk2/core/plugins/algorithms/simple-visualisation/doc/powerspectrumdisplay_online.png similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/doc/powerspectrumdisplay_online.png rename to trunk2/core/plugins/algorithms/simple-visualisation/doc/powerspectrumdisplay_online.png diff --git a/trunk2/core/plugins/boxes/simple-visualisation/doc/powerspectrumdisplay_toolbar.png b/trunk2/core/plugins/algorithms/simple-visualisation/doc/powerspectrumdisplay_toolbar.png similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/doc/powerspectrumdisplay_toolbar.png rename to trunk2/core/plugins/algorithms/simple-visualisation/doc/powerspectrumdisplay_toolbar.png diff --git a/trunk2/core/plugins/boxes/simple-visualisation/doc/signaldisplay_online.png b/trunk2/core/plugins/algorithms/simple-visualisation/doc/signaldisplay_online.png similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/doc/signaldisplay_online.png rename to trunk2/core/plugins/algorithms/simple-visualisation/doc/signaldisplay_online.png diff --git a/trunk2/core/plugins/boxes/simple-visualisation/doc/signaldisplay_toolbar.png b/trunk2/core/plugins/algorithms/simple-visualisation/doc/signaldisplay_toolbar.png similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/doc/signaldisplay_toolbar.png rename to trunk2/core/plugins/algorithms/simple-visualisation/doc/signaldisplay_toolbar.png diff --git a/trunk2/core/plugins/boxes/simple-visualisation/doc/simple3dviewer_online.png b/trunk2/core/plugins/algorithms/simple-visualisation/doc/simple3dviewer_online.png similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/doc/simple3dviewer_online.png rename to trunk2/core/plugins/algorithms/simple-visualisation/doc/simple3dviewer_online.png diff --git a/trunk2/core/plugins/boxes/simple-visualisation/doc/simple3dviewer_toolbar.png b/trunk2/core/plugins/algorithms/simple-visualisation/doc/simple3dviewer_toolbar.png similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/doc/simple3dviewer_toolbar.png rename to trunk2/core/plugins/algorithms/simple-visualisation/doc/simple3dviewer_toolbar.png diff --git a/trunk2/core/plugins/boxes/simple-visualisation/doc/timefrequencymapdisplay_online.png b/trunk2/core/plugins/algorithms/simple-visualisation/doc/timefrequencymapdisplay_online.png similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/doc/timefrequencymapdisplay_online.png rename to trunk2/core/plugins/algorithms/simple-visualisation/doc/timefrequencymapdisplay_online.png diff --git a/trunk2/core/plugins/boxes/simple-visualisation/doc/timefrequencymapdisplay_toolbar.png b/trunk2/core/plugins/algorithms/simple-visualisation/doc/timefrequencymapdisplay_toolbar.png similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/doc/timefrequencymapdisplay_toolbar.png rename to trunk2/core/plugins/algorithms/simple-visualisation/doc/timefrequencymapdisplay_toolbar.png diff --git a/trunk2/core/plugins/boxes/simple-visualisation/doc/topographicmap2ddisplay_online.png b/trunk2/core/plugins/algorithms/simple-visualisation/doc/topographicmap2ddisplay_online.png similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/doc/topographicmap2ddisplay_online.png rename to trunk2/core/plugins/algorithms/simple-visualisation/doc/topographicmap2ddisplay_online.png diff --git a/trunk2/core/plugins/boxes/simple-visualisation/doc/topographicmap2ddisplay_toolbar.png b/trunk2/core/plugins/algorithms/simple-visualisation/doc/topographicmap2ddisplay_toolbar.png similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/doc/topographicmap2ddisplay_toolbar.png rename to trunk2/core/plugins/algorithms/simple-visualisation/doc/topographicmap2ddisplay_toolbar.png diff --git a/trunk2/core/plugins/boxes/simple-visualisation/doc/topographicmap3ddisplay_2d_vs_3d_online.png b/trunk2/core/plugins/algorithms/simple-visualisation/doc/topographicmap3ddisplay_2d_vs_3d_online.png similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/doc/topographicmap3ddisplay_2d_vs_3d_online.png rename to trunk2/core/plugins/algorithms/simple-visualisation/doc/topographicmap3ddisplay_2d_vs_3d_online.png diff --git a/trunk2/core/plugins/boxes/simple-visualisation/doc/topographicmap3ddisplay_online.png b/trunk2/core/plugins/algorithms/simple-visualisation/doc/topographicmap3ddisplay_online.png similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/doc/topographicmap3ddisplay_online.png rename to trunk2/core/plugins/algorithms/simple-visualisation/doc/topographicmap3ddisplay_online.png diff --git a/trunk2/core/plugins/boxes/simple-visualisation/doc/topographicmap3ddisplay_toolbar.png b/trunk2/core/plugins/algorithms/simple-visualisation/doc/topographicmap3ddisplay_toolbar.png similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/doc/topographicmap3ddisplay_toolbar.png rename to trunk2/core/plugins/algorithms/simple-visualisation/doc/topographicmap3ddisplay_toolbar.png diff --git a/trunk2/core/plugins/boxes/simple-visualisation/doc/voxeldisplay_toolbar.png b/trunk2/core/plugins/algorithms/simple-visualisation/doc/voxeldisplay_toolbar.png similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/doc/voxeldisplay_toolbar.png rename to trunk2/core/plugins/algorithms/simple-visualisation/doc/voxeldisplay_toolbar.png diff --git a/trunk2/core/plugins/boxes/simple-visualisation/share/openvibe-simple-visualisation-ClassifierAccuracyMeasure.ui b/trunk2/core/plugins/algorithms/simple-visualisation/share/openvibe-simple-visualisation-ClassifierAccuracyMeasure.ui similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/share/openvibe-simple-visualisation-ClassifierAccuracyMeasure.ui rename to trunk2/core/plugins/algorithms/simple-visualisation/share/openvibe-simple-visualisation-ClassifierAccuracyMeasure.ui diff --git a/trunk2/core/plugins/boxes/simple-visualisation/share/openvibe-simple-visualisation-DisplayCueImage.ui b/trunk2/core/plugins/algorithms/simple-visualisation/share/openvibe-simple-visualisation-DisplayCueImage.ui similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/share/openvibe-simple-visualisation-DisplayCueImage.ui rename to trunk2/core/plugins/algorithms/simple-visualisation/share/openvibe-simple-visualisation-DisplayCueImage.ui diff --git a/trunk2/core/plugins/boxes/simple-visualisation/share/openvibe-simple-visualisation-GrazVisualization-bar.png b/trunk2/core/plugins/algorithms/simple-visualisation/share/openvibe-simple-visualisation-GrazVisualization-bar.png similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/share/openvibe-simple-visualisation-GrazVisualization-bar.png rename to trunk2/core/plugins/algorithms/simple-visualisation/share/openvibe-simple-visualisation-GrazVisualization-bar.png diff --git a/trunk2/core/plugins/boxes/simple-visualisation/share/openvibe-simple-visualisation-GrazVisualization-downArrow.png b/trunk2/core/plugins/algorithms/simple-visualisation/share/openvibe-simple-visualisation-GrazVisualization-downArrow.png similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/share/openvibe-simple-visualisation-GrazVisualization-downArrow.png rename to trunk2/core/plugins/algorithms/simple-visualisation/share/openvibe-simple-visualisation-GrazVisualization-downArrow.png diff --git a/trunk2/core/plugins/boxes/simple-visualisation/share/openvibe-simple-visualisation-GrazVisualization-leftArrow.png b/trunk2/core/plugins/algorithms/simple-visualisation/share/openvibe-simple-visualisation-GrazVisualization-leftArrow.png similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/share/openvibe-simple-visualisation-GrazVisualization-leftArrow.png rename to trunk2/core/plugins/algorithms/simple-visualisation/share/openvibe-simple-visualisation-GrazVisualization-leftArrow.png diff --git a/trunk2/core/plugins/boxes/simple-visualisation/share/openvibe-simple-visualisation-GrazVisualization-rightArrow.png b/trunk2/core/plugins/algorithms/simple-visualisation/share/openvibe-simple-visualisation-GrazVisualization-rightArrow.png similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/share/openvibe-simple-visualisation-GrazVisualization-rightArrow.png rename to trunk2/core/plugins/algorithms/simple-visualisation/share/openvibe-simple-visualisation-GrazVisualization-rightArrow.png diff --git a/trunk2/core/plugins/boxes/simple-visualisation/share/openvibe-simple-visualisation-GrazVisualization-upArrow.png b/trunk2/core/plugins/algorithms/simple-visualisation/share/openvibe-simple-visualisation-GrazVisualization-upArrow.png similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/share/openvibe-simple-visualisation-GrazVisualization-upArrow.png rename to trunk2/core/plugins/algorithms/simple-visualisation/share/openvibe-simple-visualisation-GrazVisualization-upArrow.png diff --git a/trunk2/core/plugins/boxes/simple-visualisation/share/openvibe-simple-visualisation-GrazVisualization.ui b/trunk2/core/plugins/algorithms/simple-visualisation/share/openvibe-simple-visualisation-GrazVisualization.ui similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/share/openvibe-simple-visualisation-GrazVisualization.ui rename to trunk2/core/plugins/algorithms/simple-visualisation/share/openvibe-simple-visualisation-GrazVisualization.ui diff --git a/trunk2/core/plugins/boxes/simple-visualisation/share/openvibe-simple-visualisation-LevelMeasure.ui b/trunk2/core/plugins/algorithms/simple-visualisation/share/openvibe-simple-visualisation-LevelMeasure.ui similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/share/openvibe-simple-visualisation-LevelMeasure.ui rename to trunk2/core/plugins/algorithms/simple-visualisation/share/openvibe-simple-visualisation-LevelMeasure.ui diff --git a/trunk2/core/plugins/boxes/simple-visualisation/share/openvibe-simple-visualisation-MatrixDisplay.ui b/trunk2/core/plugins/algorithms/simple-visualisation/share/openvibe-simple-visualisation-MatrixDisplay.ui similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/share/openvibe-simple-visualisation-MatrixDisplay.ui rename to trunk2/core/plugins/algorithms/simple-visualisation/share/openvibe-simple-visualisation-MatrixDisplay.ui diff --git a/trunk2/core/plugins/boxes/simple-visualisation/share/openvibe-simple-visualisation-PowerSpectrumDisplay.ui b/trunk2/core/plugins/algorithms/simple-visualisation/share/openvibe-simple-visualisation-PowerSpectrumDisplay.ui similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/share/openvibe-simple-visualisation-PowerSpectrumDisplay.ui rename to trunk2/core/plugins/algorithms/simple-visualisation/share/openvibe-simple-visualisation-PowerSpectrumDisplay.ui diff --git a/trunk2/core/plugins/boxes/simple-visualisation/share/openvibe-simple-visualisation-SignalDisplay.ui b/trunk2/core/plugins/algorithms/simple-visualisation/share/openvibe-simple-visualisation-SignalDisplay.ui similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/share/openvibe-simple-visualisation-SignalDisplay.ui rename to trunk2/core/plugins/algorithms/simple-visualisation/share/openvibe-simple-visualisation-SignalDisplay.ui diff --git a/trunk2/core/plugins/boxes/simple-visualisation/share/openvibe-simple-visualisation-Simple3DDisplay.ui b/trunk2/core/plugins/algorithms/simple-visualisation/share/openvibe-simple-visualisation-Simple3DDisplay.ui similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/share/openvibe-simple-visualisation-Simple3DDisplay.ui rename to trunk2/core/plugins/algorithms/simple-visualisation/share/openvibe-simple-visualisation-Simple3DDisplay.ui diff --git a/trunk2/core/plugins/boxes/simple-visualisation/share/openvibe-simple-visualisation-TimeFrequencyMapDisplay.ui b/trunk2/core/plugins/algorithms/simple-visualisation/share/openvibe-simple-visualisation-TimeFrequencyMapDisplay.ui similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/share/openvibe-simple-visualisation-TimeFrequencyMapDisplay.ui rename to trunk2/core/plugins/algorithms/simple-visualisation/share/openvibe-simple-visualisation-TimeFrequencyMapDisplay.ui diff --git a/trunk2/core/plugins/boxes/simple-visualisation/share/openvibe-simple-visualisation-TopographicMap2D.ui b/trunk2/core/plugins/algorithms/simple-visualisation/share/openvibe-simple-visualisation-TopographicMap2D.ui similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/share/openvibe-simple-visualisation-TopographicMap2D.ui rename to trunk2/core/plugins/algorithms/simple-visualisation/share/openvibe-simple-visualisation-TopographicMap2D.ui diff --git a/trunk2/core/plugins/boxes/simple-visualisation/share/openvibe-simple-visualisation-TopographicMap3D.ui b/trunk2/core/plugins/algorithms/simple-visualisation/share/openvibe-simple-visualisation-TopographicMap3D.ui similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/share/openvibe-simple-visualisation-TopographicMap3D.ui rename to trunk2/core/plugins/algorithms/simple-visualisation/share/openvibe-simple-visualisation-TopographicMap3D.ui diff --git a/trunk2/core/plugins/boxes/simple-visualisation/share/openvibe-simple-visualisation-VoxelDisplay.ui b/trunk2/core/plugins/algorithms/simple-visualisation/share/openvibe-simple-visualisation-VoxelDisplay.ui similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/share/openvibe-simple-visualisation-VoxelDisplay.ui rename to trunk2/core/plugins/algorithms/simple-visualisation/share/openvibe-simple-visualisation-VoxelDisplay.ui diff --git a/trunk2/core/plugins/boxes/simple-visualisation/share/p300-identifier-card.ui b/trunk2/core/plugins/algorithms/simple-visualisation/share/p300-identifier-card.ui similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/share/p300-identifier-card.ui rename to trunk2/core/plugins/algorithms/simple-visualisation/share/p300-identifier-card.ui diff --git a/trunk2/core/plugins/boxes/simple-visualisation/share/p300-magic-card.ui b/trunk2/core/plugins/algorithms/simple-visualisation/share/p300-magic-card.ui similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/share/p300-magic-card.ui rename to trunk2/core/plugins/algorithms/simple-visualisation/share/p300-magic-card.ui diff --git a/trunk2/core/plugins/boxes/simple-visualisation/share/p300-magic-card/arkanoid.png b/trunk2/core/plugins/algorithms/simple-visualisation/share/p300-magic-card/arkanoid.png similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/share/p300-magic-card/arkanoid.png rename to trunk2/core/plugins/algorithms/simple-visualisation/share/p300-magic-card/arkanoid.png diff --git a/trunk2/core/plugins/boxes/simple-visualisation/share/p300-magic-card/arkanoid.png-offscreen b/trunk2/core/plugins/algorithms/simple-visualisation/share/p300-magic-card/arkanoid.png-offscreen similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/share/p300-magic-card/arkanoid.png-offscreen rename to trunk2/core/plugins/algorithms/simple-visualisation/share/p300-magic-card/arkanoid.png-offscreen diff --git a/trunk2/core/plugins/boxes/simple-visualisation/share/p300-magic-card/bomberman.png b/trunk2/core/plugins/algorithms/simple-visualisation/share/p300-magic-card/bomberman.png similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/share/p300-magic-card/bomberman.png rename to trunk2/core/plugins/algorithms/simple-visualisation/share/p300-magic-card/bomberman.png diff --git a/trunk2/core/plugins/boxes/simple-visualisation/share/p300-magic-card/bomberman.png-offscreen b/trunk2/core/plugins/algorithms/simple-visualisation/share/p300-magic-card/bomberman.png-offscreen similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/share/p300-magic-card/bomberman.png-offscreen rename to trunk2/core/plugins/algorithms/simple-visualisation/share/p300-magic-card/bomberman.png-offscreen diff --git a/trunk2/core/plugins/boxes/simple-visualisation/share/p300-magic-card/convert.sh b/trunk2/core/plugins/algorithms/simple-visualisation/share/p300-magic-card/convert.sh similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/share/p300-magic-card/convert.sh rename to trunk2/core/plugins/algorithms/simple-visualisation/share/p300-magic-card/convert.sh diff --git a/trunk2/core/plugins/boxes/simple-visualisation/share/p300-magic-card/doom.png b/trunk2/core/plugins/algorithms/simple-visualisation/share/p300-magic-card/doom.png similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/share/p300-magic-card/doom.png rename to trunk2/core/plugins/algorithms/simple-visualisation/share/p300-magic-card/doom.png diff --git a/trunk2/core/plugins/boxes/simple-visualisation/share/p300-magic-card/doom.png-offscreen b/trunk2/core/plugins/algorithms/simple-visualisation/share/p300-magic-card/doom.png-offscreen similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/share/p300-magic-card/doom.png-offscreen rename to trunk2/core/plugins/algorithms/simple-visualisation/share/p300-magic-card/doom.png-offscreen diff --git a/trunk2/core/plugins/boxes/simple-visualisation/share/p300-magic-card/dott.png b/trunk2/core/plugins/algorithms/simple-visualisation/share/p300-magic-card/dott.png similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/share/p300-magic-card/dott.png rename to trunk2/core/plugins/algorithms/simple-visualisation/share/p300-magic-card/dott.png diff --git a/trunk2/core/plugins/boxes/simple-visualisation/share/p300-magic-card/dott.png-offscreen b/trunk2/core/plugins/algorithms/simple-visualisation/share/p300-magic-card/dott.png-offscreen similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/share/p300-magic-card/dott.png-offscreen rename to trunk2/core/plugins/algorithms/simple-visualisation/share/p300-magic-card/dott.png-offscreen diff --git a/trunk2/core/plugins/boxes/simple-visualisation/share/p300-magic-card/lemmings.png b/trunk2/core/plugins/algorithms/simple-visualisation/share/p300-magic-card/lemmings.png similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/share/p300-magic-card/lemmings.png rename to trunk2/core/plugins/algorithms/simple-visualisation/share/p300-magic-card/lemmings.png diff --git a/trunk2/core/plugins/boxes/simple-visualisation/share/p300-magic-card/lemmings.png-offscreen b/trunk2/core/plugins/algorithms/simple-visualisation/share/p300-magic-card/lemmings.png-offscreen similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/share/p300-magic-card/lemmings.png-offscreen rename to trunk2/core/plugins/algorithms/simple-visualisation/share/p300-magic-card/lemmings.png-offscreen diff --git a/trunk2/core/plugins/boxes/simple-visualisation/share/p300-magic-card/mario.png b/trunk2/core/plugins/algorithms/simple-visualisation/share/p300-magic-card/mario.png similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/share/p300-magic-card/mario.png rename to trunk2/core/plugins/algorithms/simple-visualisation/share/p300-magic-card/mario.png diff --git a/trunk2/core/plugins/boxes/simple-visualisation/share/p300-magic-card/mario.png-offscreen b/trunk2/core/plugins/algorithms/simple-visualisation/share/p300-magic-card/mario.png-offscreen similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/share/p300-magic-card/mario.png-offscreen rename to trunk2/core/plugins/algorithms/simple-visualisation/share/p300-magic-card/mario.png-offscreen diff --git a/trunk2/core/plugins/boxes/simple-visualisation/share/p300-magic-card/megaman.png b/trunk2/core/plugins/algorithms/simple-visualisation/share/p300-magic-card/megaman.png similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/share/p300-magic-card/megaman.png rename to trunk2/core/plugins/algorithms/simple-visualisation/share/p300-magic-card/megaman.png diff --git a/trunk2/core/plugins/boxes/simple-visualisation/share/p300-magic-card/megaman.png-offscreen b/trunk2/core/plugins/algorithms/simple-visualisation/share/p300-magic-card/megaman.png-offscreen similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/share/p300-magic-card/megaman.png-offscreen rename to trunk2/core/plugins/algorithms/simple-visualisation/share/p300-magic-card/megaman.png-offscreen diff --git a/trunk2/core/plugins/boxes/simple-visualisation/share/p300-magic-card/openvibe-logo.png b/trunk2/core/plugins/algorithms/simple-visualisation/share/p300-magic-card/openvibe-logo.png similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/share/p300-magic-card/openvibe-logo.png rename to trunk2/core/plugins/algorithms/simple-visualisation/share/p300-magic-card/openvibe-logo.png diff --git a/trunk2/core/plugins/boxes/simple-visualisation/share/p300-magic-card/openvibe-logo.png-offscreen b/trunk2/core/plugins/algorithms/simple-visualisation/share/p300-magic-card/openvibe-logo.png-offscreen similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/share/p300-magic-card/openvibe-logo.png-offscreen rename to trunk2/core/plugins/algorithms/simple-visualisation/share/p300-magic-card/openvibe-logo.png-offscreen diff --git a/trunk2/core/plugins/boxes/simple-visualisation/share/p300-magic-card/pacman.png b/trunk2/core/plugins/algorithms/simple-visualisation/share/p300-magic-card/pacman.png similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/share/p300-magic-card/pacman.png rename to trunk2/core/plugins/algorithms/simple-visualisation/share/p300-magic-card/pacman.png diff --git a/trunk2/core/plugins/boxes/simple-visualisation/share/p300-magic-card/pacman.png-offscreen b/trunk2/core/plugins/algorithms/simple-visualisation/share/p300-magic-card/pacman.png-offscreen similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/share/p300-magic-card/pacman.png-offscreen rename to trunk2/core/plugins/algorithms/simple-visualisation/share/p300-magic-card/pacman.png-offscreen diff --git a/trunk2/core/plugins/boxes/simple-visualisation/share/p300-magic-card/sonic.png b/trunk2/core/plugins/algorithms/simple-visualisation/share/p300-magic-card/sonic.png similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/share/p300-magic-card/sonic.png rename to trunk2/core/plugins/algorithms/simple-visualisation/share/p300-magic-card/sonic.png diff --git a/trunk2/core/plugins/boxes/simple-visualisation/share/p300-magic-card/sonic.png-offscreen b/trunk2/core/plugins/algorithms/simple-visualisation/share/p300-magic-card/sonic.png-offscreen similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/share/p300-magic-card/sonic.png-offscreen rename to trunk2/core/plugins/algorithms/simple-visualisation/share/p300-magic-card/sonic.png-offscreen diff --git a/trunk2/core/plugins/boxes/simple-visualisation/share/p300-magic-card/space-invaders.png b/trunk2/core/plugins/algorithms/simple-visualisation/share/p300-magic-card/space-invaders.png similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/share/p300-magic-card/space-invaders.png rename to trunk2/core/plugins/algorithms/simple-visualisation/share/p300-magic-card/space-invaders.png diff --git a/trunk2/core/plugins/boxes/simple-visualisation/share/p300-magic-card/space-invaders.png-offscreen b/trunk2/core/plugins/algorithms/simple-visualisation/share/p300-magic-card/space-invaders.png-offscreen similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/share/p300-magic-card/space-invaders.png-offscreen rename to trunk2/core/plugins/algorithms/simple-visualisation/share/p300-magic-card/space-invaders.png-offscreen diff --git a/trunk2/core/plugins/boxes/simple-visualisation/share/p300-magic-card/worms.png b/trunk2/core/plugins/algorithms/simple-visualisation/share/p300-magic-card/worms.png similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/share/p300-magic-card/worms.png rename to trunk2/core/plugins/algorithms/simple-visualisation/share/p300-magic-card/worms.png diff --git a/trunk2/core/plugins/boxes/simple-visualisation/share/p300-magic-card/worms.png-offscreen b/trunk2/core/plugins/algorithms/simple-visualisation/share/p300-magic-card/worms.png-offscreen similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/share/p300-magic-card/worms.png-offscreen rename to trunk2/core/plugins/algorithms/simple-visualisation/share/p300-magic-card/worms.png-offscreen diff --git a/trunk2/core/plugins/boxes/simple-visualisation/share/p300-magic-card/zelda.png b/trunk2/core/plugins/algorithms/simple-visualisation/share/p300-magic-card/zelda.png similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/share/p300-magic-card/zelda.png rename to trunk2/core/plugins/algorithms/simple-visualisation/share/p300-magic-card/zelda.png diff --git a/trunk2/core/plugins/boxes/simple-visualisation/share/p300-magic-card/zelda.png-offscreen b/trunk2/core/plugins/algorithms/simple-visualisation/share/p300-magic-card/zelda.png-offscreen similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/share/p300-magic-card/zelda.png-offscreen rename to trunk2/core/plugins/algorithms/simple-visualisation/share/p300-magic-card/zelda.png-offscreen diff --git a/trunk2/core/plugins/boxes/simple-visualisation/share/p300-speller.ui b/trunk2/core/plugins/algorithms/simple-visualisation/share/p300-speller.ui similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/share/p300-speller.ui rename to trunk2/core/plugins/algorithms/simple-visualisation/share/p300-speller.ui diff --git a/trunk2/core/plugins/boxes/simple-visualisation/share/topographicmap3D/face.mesh b/trunk2/core/plugins/algorithms/simple-visualisation/share/topographicmap3D/face.mesh similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/share/topographicmap3D/face.mesh rename to trunk2/core/plugins/algorithms/simple-visualisation/share/topographicmap3D/face.mesh diff --git a/trunk2/core/plugins/boxes/simple-visualisation/share/topographicmap3D/head.material b/trunk2/core/plugins/algorithms/simple-visualisation/share/topographicmap3D/head.material similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/share/topographicmap3D/head.material rename to trunk2/core/plugins/algorithms/simple-visualisation/share/topographicmap3D/head.material diff --git a/trunk2/core/plugins/boxes/simple-visualisation/share/topographicmap3D/projection_center.mesh b/trunk2/core/plugins/algorithms/simple-visualisation/share/topographicmap3D/projection_center.mesh similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/share/topographicmap3D/projection_center.mesh rename to trunk2/core/plugins/algorithms/simple-visualisation/share/topographicmap3D/projection_center.mesh diff --git a/trunk2/core/plugins/boxes/simple-visualisation/share/topographicmap3D/projection_center.txt b/trunk2/core/plugins/algorithms/simple-visualisation/share/topographicmap3D/projection_center.txt similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/share/topographicmap3D/projection_center.txt rename to trunk2/core/plugins/algorithms/simple-visualisation/share/topographicmap3D/projection_center.txt diff --git a/trunk2/core/plugins/boxes/simple-visualisation/share/topographicmap3D/scalp.mesh b/trunk2/core/plugins/algorithms/simple-visualisation/share/topographicmap3D/scalp.mesh similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/share/topographicmap3D/scalp.mesh rename to trunk2/core/plugins/algorithms/simple-visualisation/share/topographicmap3D/scalp.mesh diff --git a/trunk2/core/plugins/boxes/simple-visualisation/share/voxeldisplay/ov_unitcube.material b/trunk2/core/plugins/algorithms/simple-visualisation/share/voxeldisplay/ov_unitcube.material similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/share/voxeldisplay/ov_unitcube.material rename to trunk2/core/plugins/algorithms/simple-visualisation/share/voxeldisplay/ov_unitcube.material diff --git a/trunk2/core/plugins/boxes/simple-visualisation/share/voxeldisplay/ov_unitcube.mesh b/trunk2/core/plugins/algorithms/simple-visualisation/share/voxeldisplay/ov_unitcube.mesh similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/share/voxeldisplay/ov_unitcube.mesh rename to trunk2/core/plugins/algorithms/simple-visualisation/share/voxeldisplay/ov_unitcube.mesh diff --git a/trunk2/core/plugins/boxes/simple-visualisation/share/voxeldisplay/ov_unitsphere_80faces.material b/trunk2/core/plugins/algorithms/simple-visualisation/share/voxeldisplay/ov_unitsphere_80faces.material similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/share/voxeldisplay/ov_unitsphere_80faces.material rename to trunk2/core/plugins/algorithms/simple-visualisation/share/voxeldisplay/ov_unitsphere_80faces.material diff --git a/trunk2/core/plugins/boxes/simple-visualisation/share/voxeldisplay/ov_unitsphere_80faces.mesh b/trunk2/core/plugins/algorithms/simple-visualisation/share/voxeldisplay/ov_unitsphere_80faces.mesh similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/share/voxeldisplay/ov_unitsphere_80faces.mesh rename to trunk2/core/plugins/algorithms/simple-visualisation/share/voxeldisplay/ov_unitsphere_80faces.mesh diff --git a/trunk2/core/plugins/boxes/simple-visualisation/share/voxeldisplay/ov_voxeldisplay_face.mesh b/trunk2/core/plugins/algorithms/simple-visualisation/share/voxeldisplay/ov_voxeldisplay_face.mesh similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/share/voxeldisplay/ov_voxeldisplay_face.mesh rename to trunk2/core/plugins/algorithms/simple-visualisation/share/voxeldisplay/ov_voxeldisplay_face.mesh diff --git a/trunk2/core/plugins/boxes/simple-visualisation/share/voxeldisplay/ov_voxeldisplay_head.material b/trunk2/core/plugins/algorithms/simple-visualisation/share/voxeldisplay/ov_voxeldisplay_head.material similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/share/voxeldisplay/ov_voxeldisplay_head.material rename to trunk2/core/plugins/algorithms/simple-visualisation/share/voxeldisplay/ov_voxeldisplay_head.material diff --git a/trunk2/core/plugins/boxes/simple-visualisation/share/voxeldisplay/ov_voxeldisplay_scalp.mesh b/trunk2/core/plugins/algorithms/simple-visualisation/share/voxeldisplay/ov_voxeldisplay_scalp.mesh similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/share/voxeldisplay/ov_voxeldisplay_scalp.mesh rename to trunk2/core/plugins/algorithms/simple-visualisation/share/voxeldisplay/ov_voxeldisplay_scalp.mesh diff --git a/trunk2/core/plugins/boxes/simple-visualisation/share/voxeldisplay/voxel_set_2394.txt b/trunk2/core/plugins/algorithms/simple-visualisation/share/voxeldisplay/voxel_set_2394.txt similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/share/voxeldisplay/voxel_set_2394.txt rename to trunk2/core/plugins/algorithms/simple-visualisation/share/voxeldisplay/voxel_set_2394.txt diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/algorithms/linpack.cpp b/trunk2/core/plugins/algorithms/simple-visualisation/src/algorithms/linpack.cpp similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/algorithms/linpack.cpp rename to trunk2/core/plugins/algorithms/simple-visualisation/src/algorithms/linpack.cpp diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/algorithms/linpack.h b/trunk2/core/plugins/algorithms/simple-visualisation/src/algorithms/linpack.h similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/algorithms/linpack.h rename to trunk2/core/plugins/algorithms/simple-visualisation/src/algorithms/linpack.h diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/algorithms/ovpCAlgorithmLevelMeasure.cpp b/trunk2/core/plugins/algorithms/simple-visualisation/src/algorithms/ovpCAlgorithmLevelMeasure.cpp similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/algorithms/ovpCAlgorithmLevelMeasure.cpp rename to trunk2/core/plugins/algorithms/simple-visualisation/src/algorithms/ovpCAlgorithmLevelMeasure.cpp diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/algorithms/ovpCAlgorithmLevelMeasure.h b/trunk2/core/plugins/algorithms/simple-visualisation/src/algorithms/ovpCAlgorithmLevelMeasure.h similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/algorithms/ovpCAlgorithmLevelMeasure.h rename to trunk2/core/plugins/algorithms/simple-visualisation/src/algorithms/ovpCAlgorithmLevelMeasure.h diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/algorithms/ovpCAlgorithmSphericalSplineInterpolation.cpp b/trunk2/core/plugins/algorithms/simple-visualisation/src/algorithms/ovpCAlgorithmSphericalSplineInterpolation.cpp similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/algorithms/ovpCAlgorithmSphericalSplineInterpolation.cpp rename to trunk2/core/plugins/algorithms/simple-visualisation/src/algorithms/ovpCAlgorithmSphericalSplineInterpolation.cpp diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/algorithms/ovpCAlgorithmSphericalSplineInterpolation.h b/trunk2/core/plugins/algorithms/simple-visualisation/src/algorithms/ovpCAlgorithmSphericalSplineInterpolation.h similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/algorithms/ovpCAlgorithmSphericalSplineInterpolation.h rename to trunk2/core/plugins/algorithms/simple-visualisation/src/algorithms/ovpCAlgorithmSphericalSplineInterpolation.h diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/algorithms/spline_sph.cpp b/trunk2/core/plugins/algorithms/simple-visualisation/src/algorithms/spline_sph.cpp similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/algorithms/spline_sph.cpp rename to trunk2/core/plugins/algorithms/simple-visualisation/src/algorithms/spline_sph.cpp diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/algorithms/spline_sph.h b/trunk2/core/plugins/algorithms/simple-visualisation/src/algorithms/spline_sph.h similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/algorithms/spline_sph.h rename to trunk2/core/plugins/algorithms/simple-visualisation/src/algorithms/spline_sph.h diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCBoxAlgorithmClassifierAccuracyMeasure.cpp b/trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCBoxAlgorithmClassifierAccuracyMeasure.cpp similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCBoxAlgorithmClassifierAccuracyMeasure.cpp rename to trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCBoxAlgorithmClassifierAccuracyMeasure.cpp diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCBoxAlgorithmClassifierAccuracyMeasure.h b/trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCBoxAlgorithmClassifierAccuracyMeasure.h similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCBoxAlgorithmClassifierAccuracyMeasure.h rename to trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCBoxAlgorithmClassifierAccuracyMeasure.h diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCBoxAlgorithmLevelMeasure.cpp b/trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCBoxAlgorithmLevelMeasure.cpp similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCBoxAlgorithmLevelMeasure.cpp rename to trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCBoxAlgorithmLevelMeasure.cpp diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCBoxAlgorithmLevelMeasure.h b/trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCBoxAlgorithmLevelMeasure.h similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCBoxAlgorithmLevelMeasure.h rename to trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCBoxAlgorithmLevelMeasure.h diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCBoxAlgorithmMatrixDisplay.cpp b/trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCBoxAlgorithmMatrixDisplay.cpp similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCBoxAlgorithmMatrixDisplay.cpp rename to trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCBoxAlgorithmMatrixDisplay.cpp diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCBoxAlgorithmMatrixDisplay.h b/trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCBoxAlgorithmMatrixDisplay.h similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCBoxAlgorithmMatrixDisplay.h rename to trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCBoxAlgorithmMatrixDisplay.h diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCBoxAlgorithmP300IdentifierCardVisualisation.cpp b/trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCBoxAlgorithmP300IdentifierCardVisualisation.cpp similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCBoxAlgorithmP300IdentifierCardVisualisation.cpp rename to trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCBoxAlgorithmP300IdentifierCardVisualisation.cpp diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCBoxAlgorithmP300IdentifierCardVisualisation.h b/trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCBoxAlgorithmP300IdentifierCardVisualisation.h similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCBoxAlgorithmP300IdentifierCardVisualisation.h rename to trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCBoxAlgorithmP300IdentifierCardVisualisation.h diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCBoxAlgorithmP300MagicCardVisualisation.cpp b/trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCBoxAlgorithmP300MagicCardVisualisation.cpp similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCBoxAlgorithmP300MagicCardVisualisation.cpp rename to trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCBoxAlgorithmP300MagicCardVisualisation.cpp diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCBoxAlgorithmP300MagicCardVisualisation.h b/trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCBoxAlgorithmP300MagicCardVisualisation.h similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCBoxAlgorithmP300MagicCardVisualisation.h rename to trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCBoxAlgorithmP300MagicCardVisualisation.h diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCBoxAlgorithmP300SpellerVisualisation.cpp b/trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCBoxAlgorithmP300SpellerVisualisation.cpp similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCBoxAlgorithmP300SpellerVisualisation.cpp rename to trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCBoxAlgorithmP300SpellerVisualisation.cpp diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCBoxAlgorithmP300SpellerVisualisation.h b/trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCBoxAlgorithmP300SpellerVisualisation.h similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCBoxAlgorithmP300SpellerVisualisation.h rename to trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCBoxAlgorithmP300SpellerVisualisation.h diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCDisplayCueImage.cpp b/trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCDisplayCueImage.cpp similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCDisplayCueImage.cpp rename to trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCDisplayCueImage.cpp diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCDisplayCueImage.h b/trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCDisplayCueImage.h similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCDisplayCueImage.h rename to trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCDisplayCueImage.h diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCGrazVisualization.cpp b/trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCGrazVisualization.cpp similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCGrazVisualization.cpp rename to trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCGrazVisualization.cpp diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCGrazVisualization.h b/trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCGrazVisualization.h similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCGrazVisualization.h rename to trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCGrazVisualization.h diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCPowerSpectrumDisplay.cpp b/trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCPowerSpectrumDisplay.cpp similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCPowerSpectrumDisplay.cpp rename to trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCPowerSpectrumDisplay.cpp diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCPowerSpectrumDisplay.h b/trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCPowerSpectrumDisplay.h similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCPowerSpectrumDisplay.h rename to trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCPowerSpectrumDisplay.h diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCPowerSpectrumDisplay/ovpCPowerSpectrumChannelDisplay.cpp b/trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCPowerSpectrumDisplay/ovpCPowerSpectrumChannelDisplay.cpp similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCPowerSpectrumDisplay/ovpCPowerSpectrumChannelDisplay.cpp rename to trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCPowerSpectrumDisplay/ovpCPowerSpectrumChannelDisplay.cpp diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCPowerSpectrumDisplay/ovpCPowerSpectrumChannelDisplay.h b/trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCPowerSpectrumDisplay/ovpCPowerSpectrumChannelDisplay.h similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCPowerSpectrumDisplay/ovpCPowerSpectrumChannelDisplay.h rename to trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCPowerSpectrumDisplay/ovpCPowerSpectrumChannelDisplay.h diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCPowerSpectrumDisplay/ovpCPowerSpectrumDatabase.cpp b/trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCPowerSpectrumDisplay/ovpCPowerSpectrumDatabase.cpp similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCPowerSpectrumDisplay/ovpCPowerSpectrumDatabase.cpp rename to trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCPowerSpectrumDisplay/ovpCPowerSpectrumDatabase.cpp diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCPowerSpectrumDisplay/ovpCPowerSpectrumDatabase.h b/trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCPowerSpectrumDisplay/ovpCPowerSpectrumDatabase.h similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCPowerSpectrumDisplay/ovpCPowerSpectrumDatabase.h rename to trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCPowerSpectrumDisplay/ovpCPowerSpectrumDatabase.h diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCPowerSpectrumDisplay/ovpCPowerSpectrumDisplayView.cpp b/trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCPowerSpectrumDisplay/ovpCPowerSpectrumDisplayView.cpp similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCPowerSpectrumDisplay/ovpCPowerSpectrumDisplayView.cpp rename to trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCPowerSpectrumDisplay/ovpCPowerSpectrumDisplayView.cpp diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCPowerSpectrumDisplay/ovpCPowerSpectrumDisplayView.h b/trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCPowerSpectrumDisplay/ovpCPowerSpectrumDisplayView.h similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCPowerSpectrumDisplay/ovpCPowerSpectrumDisplayView.h rename to trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCPowerSpectrumDisplay/ovpCPowerSpectrumDisplayView.h diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCSignalDisplay.cpp b/trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCSignalDisplay.cpp similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCSignalDisplay.cpp rename to trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCSignalDisplay.cpp diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCSignalDisplay.h b/trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCSignalDisplay.h similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCSignalDisplay.h rename to trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCSignalDisplay.h diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCSignalDisplay/ovpCSignalChannelDisplay.cpp b/trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCSignalDisplay/ovpCSignalChannelDisplay.cpp similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCSignalDisplay/ovpCSignalChannelDisplay.cpp rename to trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCSignalDisplay/ovpCSignalChannelDisplay.cpp diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCSignalDisplay/ovpCSignalChannelDisplay.h b/trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCSignalDisplay/ovpCSignalChannelDisplay.h similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCSignalDisplay/ovpCSignalChannelDisplay.h rename to trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCSignalDisplay/ovpCSignalChannelDisplay.h diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCSignalDisplay/ovpCSignalDisplayLeftRuler.cpp b/trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCSignalDisplay/ovpCSignalDisplayLeftRuler.cpp similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCSignalDisplay/ovpCSignalDisplayLeftRuler.cpp rename to trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCSignalDisplay/ovpCSignalDisplayLeftRuler.cpp diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCSignalDisplay/ovpCSignalDisplayLeftRuler.h b/trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCSignalDisplay/ovpCSignalDisplayLeftRuler.h similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCSignalDisplay/ovpCSignalDisplayLeftRuler.h rename to trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCSignalDisplay/ovpCSignalDisplayLeftRuler.h diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCSignalDisplay/ovpCSignalDisplayView.cpp b/trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCSignalDisplay/ovpCSignalDisplayView.cpp similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCSignalDisplay/ovpCSignalDisplayView.cpp rename to trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCSignalDisplay/ovpCSignalDisplayView.cpp diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCSignalDisplay/ovpCSignalDisplayView.h b/trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCSignalDisplay/ovpCSignalDisplayView.h similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCSignalDisplay/ovpCSignalDisplayView.h rename to trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCSignalDisplay/ovpCSignalDisplayView.h diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCSimple3DDisplay.cpp b/trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCSimple3DDisplay.cpp similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCSimple3DDisplay.cpp rename to trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCSimple3DDisplay.cpp diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCSimple3DDisplay.h b/trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCSimple3DDisplay.h similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCSimple3DDisplay.h rename to trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCSimple3DDisplay.h diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCSimple3DDisplay/ovpCSimple3DDatabase.cpp b/trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCSimple3DDisplay/ovpCSimple3DDatabase.cpp similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCSimple3DDisplay/ovpCSimple3DDatabase.cpp rename to trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCSimple3DDisplay/ovpCSimple3DDatabase.cpp diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCSimple3DDisplay/ovpCSimple3DDatabase.h b/trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCSimple3DDisplay/ovpCSimple3DDatabase.h similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCSimple3DDisplay/ovpCSimple3DDatabase.h rename to trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCSimple3DDisplay/ovpCSimple3DDatabase.h diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCSimple3DDisplay/ovpCSimple3DView.cpp b/trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCSimple3DDisplay/ovpCSimple3DView.cpp similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCSimple3DDisplay/ovpCSimple3DView.cpp rename to trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCSimple3DDisplay/ovpCSimple3DView.cpp diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCSimple3DDisplay/ovpCSimple3DView.h b/trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCSimple3DDisplay/ovpCSimple3DView.h similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCSimple3DDisplay/ovpCSimple3DView.h rename to trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCSimple3DDisplay/ovpCSimple3DView.h diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCTimeFrequencyMapDisplay.cpp b/trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCTimeFrequencyMapDisplay.cpp similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCTimeFrequencyMapDisplay.cpp rename to trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCTimeFrequencyMapDisplay.cpp diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCTimeFrequencyMapDisplay.h b/trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCTimeFrequencyMapDisplay.h similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCTimeFrequencyMapDisplay.h rename to trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCTimeFrequencyMapDisplay.h diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCTimeFrequencyMapDisplay/ovpCTimeFrequencyMapChannelDisplay.cpp b/trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCTimeFrequencyMapDisplay/ovpCTimeFrequencyMapChannelDisplay.cpp similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCTimeFrequencyMapDisplay/ovpCTimeFrequencyMapChannelDisplay.cpp rename to trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCTimeFrequencyMapDisplay/ovpCTimeFrequencyMapChannelDisplay.cpp diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCTimeFrequencyMapDisplay/ovpCTimeFrequencyMapChannelDisplay.h b/trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCTimeFrequencyMapDisplay/ovpCTimeFrequencyMapChannelDisplay.h similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCTimeFrequencyMapDisplay/ovpCTimeFrequencyMapChannelDisplay.h rename to trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCTimeFrequencyMapDisplay/ovpCTimeFrequencyMapChannelDisplay.h diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCTimeFrequencyMapDisplay/ovpCTimeFrequencyMapDisplayView.cpp b/trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCTimeFrequencyMapDisplay/ovpCTimeFrequencyMapDisplayView.cpp similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCTimeFrequencyMapDisplay/ovpCTimeFrequencyMapDisplayView.cpp rename to trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCTimeFrequencyMapDisplay/ovpCTimeFrequencyMapDisplayView.cpp diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCTimeFrequencyMapDisplay/ovpCTimeFrequencyMapDisplayView.h b/trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCTimeFrequencyMapDisplay/ovpCTimeFrequencyMapDisplayView.h similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCTimeFrequencyMapDisplay/ovpCTimeFrequencyMapDisplayView.h rename to trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCTimeFrequencyMapDisplay/ovpCTimeFrequencyMapDisplayView.h diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCTopographicMap2DDisplay.cpp b/trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCTopographicMap2DDisplay.cpp similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCTopographicMap2DDisplay.cpp rename to trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCTopographicMap2DDisplay.cpp diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCTopographicMap2DDisplay.h b/trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCTopographicMap2DDisplay.h similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCTopographicMap2DDisplay.h rename to trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCTopographicMap2DDisplay.h diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCTopographicMap2DDisplay/ovpCTopographicMap2DView.cpp b/trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCTopographicMap2DDisplay/ovpCTopographicMap2DView.cpp similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCTopographicMap2DDisplay/ovpCTopographicMap2DView.cpp rename to trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCTopographicMap2DDisplay/ovpCTopographicMap2DView.cpp diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCTopographicMap2DDisplay/ovpCTopographicMap2DView.h b/trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCTopographicMap2DDisplay/ovpCTopographicMap2DView.h similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCTopographicMap2DDisplay/ovpCTopographicMap2DView.h rename to trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCTopographicMap2DDisplay/ovpCTopographicMap2DView.h diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCTopographicMap3DDisplay.cpp b/trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCTopographicMap3DDisplay.cpp similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCTopographicMap3DDisplay.cpp rename to trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCTopographicMap3DDisplay.cpp diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCTopographicMap3DDisplay.h b/trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCTopographicMap3DDisplay.h similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCTopographicMap3DDisplay.h rename to trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCTopographicMap3DDisplay.h diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCTopographicMap3DDisplay/ovpCTopographicMap3DView.cpp b/trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCTopographicMap3DDisplay/ovpCTopographicMap3DView.cpp similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCTopographicMap3DDisplay/ovpCTopographicMap3DView.cpp rename to trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCTopographicMap3DDisplay/ovpCTopographicMap3DView.cpp diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCTopographicMap3DDisplay/ovpCTopographicMap3DView.h b/trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCTopographicMap3DDisplay/ovpCTopographicMap3DView.h similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCTopographicMap3DDisplay/ovpCTopographicMap3DView.h rename to trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCTopographicMap3DDisplay/ovpCTopographicMap3DView.h diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCVoxelDisplay.cpp b/trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCVoxelDisplay.cpp similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCVoxelDisplay.cpp rename to trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCVoxelDisplay.cpp diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCVoxelDisplay.h b/trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCVoxelDisplay.h similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCVoxelDisplay.h rename to trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCVoxelDisplay.h diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCVoxelDisplay/ovpCVoxelView.cpp b/trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCVoxelDisplay/ovpCVoxelView.cpp similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCVoxelDisplay/ovpCVoxelView.cpp rename to trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCVoxelDisplay/ovpCVoxelView.cpp diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCVoxelDisplay/ovpCVoxelView.h b/trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCVoxelDisplay/ovpCVoxelView.h similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/box-algorithms/ovpCVoxelDisplay/ovpCVoxelView.h rename to trunk2/core/plugins/algorithms/simple-visualisation/src/box-algorithms/ovpCVoxelDisplay/ovpCVoxelView.h diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/ovpCBottomTimeRuler.cpp b/trunk2/core/plugins/algorithms/simple-visualisation/src/ovpCBottomTimeRuler.cpp similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/ovpCBottomTimeRuler.cpp rename to trunk2/core/plugins/algorithms/simple-visualisation/src/ovpCBottomTimeRuler.cpp diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/ovpCBottomTimeRuler.h b/trunk2/core/plugins/algorithms/simple-visualisation/src/ovpCBottomTimeRuler.h similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/ovpCBottomTimeRuler.h rename to trunk2/core/plugins/algorithms/simple-visualisation/src/ovpCBottomTimeRuler.h diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/ovpCBufferDatabase.cpp b/trunk2/core/plugins/algorithms/simple-visualisation/src/ovpCBufferDatabase.cpp similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/ovpCBufferDatabase.cpp rename to trunk2/core/plugins/algorithms/simple-visualisation/src/ovpCBufferDatabase.cpp diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/ovpCBufferDatabase.h b/trunk2/core/plugins/algorithms/simple-visualisation/src/ovpCBufferDatabase.h similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/ovpCBufferDatabase.h rename to trunk2/core/plugins/algorithms/simple-visualisation/src/ovpCBufferDatabase.h diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/ovpCSpectrumDatabase.cpp b/trunk2/core/plugins/algorithms/simple-visualisation/src/ovpCSpectrumDatabase.cpp similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/ovpCSpectrumDatabase.cpp rename to trunk2/core/plugins/algorithms/simple-visualisation/src/ovpCSpectrumDatabase.cpp diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/ovpCSpectrumDatabase.h b/trunk2/core/plugins/algorithms/simple-visualisation/src/ovpCSpectrumDatabase.h similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/ovpCSpectrumDatabase.h rename to trunk2/core/plugins/algorithms/simple-visualisation/src/ovpCSpectrumDatabase.h diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/ovpCStreamedMatrixDatabase.cpp b/trunk2/core/plugins/algorithms/simple-visualisation/src/ovpCStreamedMatrixDatabase.cpp similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/ovpCStreamedMatrixDatabase.cpp rename to trunk2/core/plugins/algorithms/simple-visualisation/src/ovpCStreamedMatrixDatabase.cpp diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/ovpCStreamedMatrixDatabase.h b/trunk2/core/plugins/algorithms/simple-visualisation/src/ovpCStreamedMatrixDatabase.h similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/ovpCStreamedMatrixDatabase.h rename to trunk2/core/plugins/algorithms/simple-visualisation/src/ovpCStreamedMatrixDatabase.h diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/ovpCTimeRuler.cpp b/trunk2/core/plugins/algorithms/simple-visualisation/src/ovpCTimeRuler.cpp similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/ovpCTimeRuler.cpp rename to trunk2/core/plugins/algorithms/simple-visualisation/src/ovpCTimeRuler.cpp diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/ovpCTimeRuler.h b/trunk2/core/plugins/algorithms/simple-visualisation/src/ovpCTimeRuler.h similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/ovpCTimeRuler.h rename to trunk2/core/plugins/algorithms/simple-visualisation/src/ovpCTimeRuler.h diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/ovpCTopographicMapDatabase.cpp b/trunk2/core/plugins/algorithms/simple-visualisation/src/ovpCTopographicMapDatabase.cpp similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/ovpCTopographicMapDatabase.cpp rename to trunk2/core/plugins/algorithms/simple-visualisation/src/ovpCTopographicMapDatabase.cpp diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/ovpCTopographicMapDatabase.h b/trunk2/core/plugins/algorithms/simple-visualisation/src/ovpCTopographicMapDatabase.h similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/ovpCTopographicMapDatabase.h rename to trunk2/core/plugins/algorithms/simple-visualisation/src/ovpCTopographicMapDatabase.h diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/ovpIStreamDatabase.h b/trunk2/core/plugins/algorithms/simple-visualisation/src/ovpIStreamDatabase.h similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/ovpIStreamDatabase.h rename to trunk2/core/plugins/algorithms/simple-visualisation/src/ovpIStreamDatabase.h diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/ovp_defines.h b/trunk2/core/plugins/algorithms/simple-visualisation/src/ovp_defines.h similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/ovp_defines.h rename to trunk2/core/plugins/algorithms/simple-visualisation/src/ovp_defines.h diff --git a/trunk2/core/plugins/boxes/simple-visualisation/src/ovp_main.cpp b/trunk2/core/plugins/algorithms/simple-visualisation/src/ovp_main.cpp similarity index 100% rename from trunk2/core/plugins/boxes/simple-visualisation/src/ovp_main.cpp rename to trunk2/core/plugins/algorithms/simple-visualisation/src/ovp_main.cpp diff --git a/trunk2/core/plugins/boxes/stimulation/CMakeLists.txt b/trunk2/core/plugins/algorithms/stimulation/CMakeLists.txt similarity index 100% rename from trunk2/core/plugins/boxes/stimulation/CMakeLists.txt rename to trunk2/core/plugins/algorithms/stimulation/CMakeLists.txt diff --git a/trunk2/core/plugins/boxes/stimulation/doc/Doc_BoxAlgorithm_KeyboardStimulator.dox-part b/trunk2/core/plugins/algorithms/stimulation/doc/Doc_BoxAlgorithm_KeyboardStimulator.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/stimulation/doc/Doc_BoxAlgorithm_KeyboardStimulator.dox-part rename to trunk2/core/plugins/algorithms/stimulation/doc/Doc_BoxAlgorithm_KeyboardStimulator.dox-part diff --git a/trunk2/core/plugins/boxes/stimulation/doc/Doc_BoxAlgorithm_LuaStimulator.dox-part b/trunk2/core/plugins/algorithms/stimulation/doc/Doc_BoxAlgorithm_LuaStimulator.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/stimulation/doc/Doc_BoxAlgorithm_LuaStimulator.dox-part rename to trunk2/core/plugins/algorithms/stimulation/doc/Doc_BoxAlgorithm_LuaStimulator.dox-part diff --git a/trunk2/core/plugins/boxes/stimulation/doc/Doc_BoxAlgorithm_P300IdentifierStimulator.dox-part b/trunk2/core/plugins/algorithms/stimulation/doc/Doc_BoxAlgorithm_P300IdentifierStimulator.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/stimulation/doc/Doc_BoxAlgorithm_P300IdentifierStimulator.dox-part rename to trunk2/core/plugins/algorithms/stimulation/doc/Doc_BoxAlgorithm_P300IdentifierStimulator.dox-part diff --git a/trunk2/core/plugins/boxes/stimulation/doc/Doc_BoxAlgorithm_P300SpellerStimulator.dox-part b/trunk2/core/plugins/algorithms/stimulation/doc/Doc_BoxAlgorithm_P300SpellerStimulator.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/stimulation/doc/Doc_BoxAlgorithm_P300SpellerStimulator.dox-part rename to trunk2/core/plugins/algorithms/stimulation/doc/Doc_BoxAlgorithm_P300SpellerStimulator.dox-part diff --git a/trunk2/core/plugins/boxes/stimulation/doc/Doc_BoxAlgorithm_RunCommand.dox-part b/trunk2/core/plugins/algorithms/stimulation/doc/Doc_BoxAlgorithm_RunCommand.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/stimulation/doc/Doc_BoxAlgorithm_RunCommand.dox-part rename to trunk2/core/plugins/algorithms/stimulation/doc/Doc_BoxAlgorithm_RunCommand.dox-part diff --git a/trunk2/core/plugins/boxes/stimulation/doc/Doc_BoxAlgorithm_SignChangeDetector.dox-part b/trunk2/core/plugins/algorithms/stimulation/doc/Doc_BoxAlgorithm_SignChangeDetector.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/stimulation/doc/Doc_BoxAlgorithm_SignChangeDetector.dox-part rename to trunk2/core/plugins/algorithms/stimulation/doc/Doc_BoxAlgorithm_SignChangeDetector.dox-part diff --git a/trunk2/core/plugins/boxes/stimulation/doc/Doc_BoxAlgorithm_SoundPlayer.dox-part b/trunk2/core/plugins/algorithms/stimulation/doc/Doc_BoxAlgorithm_SoundPlayer.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/stimulation/doc/Doc_BoxAlgorithm_SoundPlayer.dox-part rename to trunk2/core/plugins/algorithms/stimulation/doc/Doc_BoxAlgorithm_SoundPlayer.dox-part diff --git a/trunk2/core/plugins/boxes/stimulation/doc/Doc_BoxAlgorithm_SoundPlayerDeprecated.dox-part b/trunk2/core/plugins/algorithms/stimulation/doc/Doc_BoxAlgorithm_SoundPlayerDeprecated.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/stimulation/doc/Doc_BoxAlgorithm_SoundPlayerDeprecated.dox-part rename to trunk2/core/plugins/algorithms/stimulation/doc/Doc_BoxAlgorithm_SoundPlayerDeprecated.dox-part diff --git a/trunk2/core/plugins/boxes/stimulation/doc/Doc_BoxAlgorithm_StimulationFilter.dox-part b/trunk2/core/plugins/algorithms/stimulation/doc/Doc_BoxAlgorithm_StimulationFilter.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/stimulation/doc/Doc_BoxAlgorithm_StimulationFilter.dox-part rename to trunk2/core/plugins/algorithms/stimulation/doc/Doc_BoxAlgorithm_StimulationFilter.dox-part diff --git a/trunk2/core/plugins/boxes/stimulation/doc/Doc_BoxAlgorithm_StimulationMultiplexer.dox-part b/trunk2/core/plugins/algorithms/stimulation/doc/Doc_BoxAlgorithm_StimulationMultiplexer.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/stimulation/doc/Doc_BoxAlgorithm_StimulationMultiplexer.dox-part rename to trunk2/core/plugins/algorithms/stimulation/doc/Doc_BoxAlgorithm_StimulationMultiplexer.dox-part diff --git a/trunk2/core/plugins/boxes/stimulation/doc/Doc_BoxAlgorithm_StimulationVoter.dox-part b/trunk2/core/plugins/algorithms/stimulation/doc/Doc_BoxAlgorithm_StimulationVoter.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/stimulation/doc/Doc_BoxAlgorithm_StimulationVoter.dox-part rename to trunk2/core/plugins/algorithms/stimulation/doc/Doc_BoxAlgorithm_StimulationVoter.dox-part diff --git a/trunk2/core/plugins/boxes/stimulation/doc/Doc_BoxAlgorithm_Timeout.dox-part-skeleton b/trunk2/core/plugins/algorithms/stimulation/doc/Doc_BoxAlgorithm_Timeout.dox-part-skeleton similarity index 100% rename from trunk2/core/plugins/boxes/stimulation/doc/Doc_BoxAlgorithm_Timeout.dox-part-skeleton rename to trunk2/core/plugins/algorithms/stimulation/doc/Doc_BoxAlgorithm_Timeout.dox-part-skeleton diff --git a/trunk2/core/plugins/boxes/stimulation/doc/Doc_BoxAlgorithm_XMLStimulationScenarioPlayer.dox-part b/trunk2/core/plugins/algorithms/stimulation/doc/Doc_BoxAlgorithm_XMLStimulationScenarioPlayer.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/stimulation/doc/Doc_BoxAlgorithm_XMLStimulationScenarioPlayer.dox-part rename to trunk2/core/plugins/algorithms/stimulation/doc/Doc_BoxAlgorithm_XMLStimulationScenarioPlayer.dox-part diff --git a/trunk2/core/plugins/boxes/stimulation/share/graz_keyboard_to_stimulations.txt b/trunk2/core/plugins/algorithms/stimulation/share/graz_keyboard_to_stimulations.txt similarity index 100% rename from trunk2/core/plugins/boxes/stimulation/share/graz_keyboard_to_stimulations.txt rename to trunk2/core/plugins/algorithms/stimulation/share/graz_keyboard_to_stimulations.txt diff --git a/trunk2/core/plugins/boxes/stimulation/share/graz_stimulation_scenario.xml b/trunk2/core/plugins/algorithms/stimulation/share/graz_stimulation_scenario.xml similarity index 100% rename from trunk2/core/plugins/boxes/stimulation/share/graz_stimulation_scenario.xml rename to trunk2/core/plugins/algorithms/stimulation/share/graz_stimulation_scenario.xml diff --git a/trunk2/core/plugins/boxes/stimulation/share/keyboard-stimulator.ui b/trunk2/core/plugins/algorithms/stimulation/share/keyboard-stimulator.ui similarity index 100% rename from trunk2/core/plugins/boxes/stimulation/share/keyboard-stimulator.ui rename to trunk2/core/plugins/algorithms/stimulation/share/keyboard-stimulator.ui diff --git a/trunk2/core/plugins/boxes/stimulation/share/lua-stimulator-legacy.lua b/trunk2/core/plugins/algorithms/stimulation/share/lua-stimulator-legacy.lua similarity index 100% rename from trunk2/core/plugins/boxes/stimulation/share/lua-stimulator-legacy.lua rename to trunk2/core/plugins/algorithms/stimulation/share/lua-stimulator-legacy.lua diff --git a/trunk2/core/plugins/boxes/stimulation/share/lua-stimulator-stim-codes.lua b/trunk2/core/plugins/algorithms/stimulation/share/lua-stimulator-stim-codes.lua similarity index 100% rename from trunk2/core/plugins/boxes/stimulation/share/lua-stimulator-stim-codes.lua rename to trunk2/core/plugins/algorithms/stimulation/share/lua-stimulator-stim-codes.lua diff --git a/trunk2/core/plugins/boxes/stimulation/share/ov_beep.wav b/trunk2/core/plugins/algorithms/stimulation/share/ov_beep.wav similarity index 100% rename from trunk2/core/plugins/boxes/stimulation/share/ov_beep.wav rename to trunk2/core/plugins/algorithms/stimulation/share/ov_beep.wav diff --git a/trunk2/core/plugins/boxes/stimulation/share/sample-lua-script.lua b/trunk2/core/plugins/algorithms/stimulation/share/sample-lua-script.lua similarity index 100% rename from trunk2/core/plugins/boxes/stimulation/share/sample-lua-script.lua rename to trunk2/core/plugins/algorithms/stimulation/share/sample-lua-script.lua diff --git a/trunk2/core/plugins/boxes/stimulation/share/simple-keyboard-to-stimulations.txt b/trunk2/core/plugins/algorithms/stimulation/share/simple-keyboard-to-stimulations.txt similarity index 100% rename from trunk2/core/plugins/boxes/stimulation/share/simple-keyboard-to-stimulations.txt rename to trunk2/core/plugins/algorithms/stimulation/share/simple-keyboard-to-stimulations.txt diff --git a/trunk2/core/plugins/boxes/stimulation/src/box-algorithms/adaptation/ovpCBoxAlgorithmStimulationFilter.cpp b/trunk2/core/plugins/algorithms/stimulation/src/box-algorithms/adaptation/ovpCBoxAlgorithmStimulationFilter.cpp similarity index 100% rename from trunk2/core/plugins/boxes/stimulation/src/box-algorithms/adaptation/ovpCBoxAlgorithmStimulationFilter.cpp rename to trunk2/core/plugins/algorithms/stimulation/src/box-algorithms/adaptation/ovpCBoxAlgorithmStimulationFilter.cpp diff --git a/trunk2/core/plugins/boxes/stimulation/src/box-algorithms/adaptation/ovpCBoxAlgorithmStimulationFilter.h b/trunk2/core/plugins/algorithms/stimulation/src/box-algorithms/adaptation/ovpCBoxAlgorithmStimulationFilter.h similarity index 100% rename from trunk2/core/plugins/boxes/stimulation/src/box-algorithms/adaptation/ovpCBoxAlgorithmStimulationFilter.h rename to trunk2/core/plugins/algorithms/stimulation/src/box-algorithms/adaptation/ovpCBoxAlgorithmStimulationFilter.h diff --git a/trunk2/core/plugins/boxes/stimulation/src/box-algorithms/ovpCBoxAlgorithmLuaStimulator.cpp b/trunk2/core/plugins/algorithms/stimulation/src/box-algorithms/ovpCBoxAlgorithmLuaStimulator.cpp similarity index 100% rename from trunk2/core/plugins/boxes/stimulation/src/box-algorithms/ovpCBoxAlgorithmLuaStimulator.cpp rename to trunk2/core/plugins/algorithms/stimulation/src/box-algorithms/ovpCBoxAlgorithmLuaStimulator.cpp diff --git a/trunk2/core/plugins/boxes/stimulation/src/box-algorithms/ovpCBoxAlgorithmLuaStimulator.h b/trunk2/core/plugins/algorithms/stimulation/src/box-algorithms/ovpCBoxAlgorithmLuaStimulator.h similarity index 100% rename from trunk2/core/plugins/boxes/stimulation/src/box-algorithms/ovpCBoxAlgorithmLuaStimulator.h rename to trunk2/core/plugins/algorithms/stimulation/src/box-algorithms/ovpCBoxAlgorithmLuaStimulator.h diff --git a/trunk2/core/plugins/boxes/stimulation/src/box-algorithms/ovpCBoxAlgorithmOpenALSoundPlayer.cpp b/trunk2/core/plugins/algorithms/stimulation/src/box-algorithms/ovpCBoxAlgorithmOpenALSoundPlayer.cpp similarity index 100% rename from trunk2/core/plugins/boxes/stimulation/src/box-algorithms/ovpCBoxAlgorithmOpenALSoundPlayer.cpp rename to trunk2/core/plugins/algorithms/stimulation/src/box-algorithms/ovpCBoxAlgorithmOpenALSoundPlayer.cpp diff --git a/trunk2/core/plugins/boxes/stimulation/src/box-algorithms/ovpCBoxAlgorithmOpenALSoundPlayer.h b/trunk2/core/plugins/algorithms/stimulation/src/box-algorithms/ovpCBoxAlgorithmOpenALSoundPlayer.h similarity index 100% rename from trunk2/core/plugins/boxes/stimulation/src/box-algorithms/ovpCBoxAlgorithmOpenALSoundPlayer.h rename to trunk2/core/plugins/algorithms/stimulation/src/box-algorithms/ovpCBoxAlgorithmOpenALSoundPlayer.h diff --git a/trunk2/core/plugins/boxes/stimulation/src/box-algorithms/ovpCBoxAlgorithmP300IdentifierStimulator.cpp b/trunk2/core/plugins/algorithms/stimulation/src/box-algorithms/ovpCBoxAlgorithmP300IdentifierStimulator.cpp similarity index 100% rename from trunk2/core/plugins/boxes/stimulation/src/box-algorithms/ovpCBoxAlgorithmP300IdentifierStimulator.cpp rename to trunk2/core/plugins/algorithms/stimulation/src/box-algorithms/ovpCBoxAlgorithmP300IdentifierStimulator.cpp diff --git a/trunk2/core/plugins/boxes/stimulation/src/box-algorithms/ovpCBoxAlgorithmP300IdentifierStimulator.h b/trunk2/core/plugins/algorithms/stimulation/src/box-algorithms/ovpCBoxAlgorithmP300IdentifierStimulator.h similarity index 100% rename from trunk2/core/plugins/boxes/stimulation/src/box-algorithms/ovpCBoxAlgorithmP300IdentifierStimulator.h rename to trunk2/core/plugins/algorithms/stimulation/src/box-algorithms/ovpCBoxAlgorithmP300IdentifierStimulator.h diff --git a/trunk2/core/plugins/boxes/stimulation/src/box-algorithms/ovpCBoxAlgorithmP300SpellerStimulator.cpp b/trunk2/core/plugins/algorithms/stimulation/src/box-algorithms/ovpCBoxAlgorithmP300SpellerStimulator.cpp similarity index 100% rename from trunk2/core/plugins/boxes/stimulation/src/box-algorithms/ovpCBoxAlgorithmP300SpellerStimulator.cpp rename to trunk2/core/plugins/algorithms/stimulation/src/box-algorithms/ovpCBoxAlgorithmP300SpellerStimulator.cpp diff --git a/trunk2/core/plugins/boxes/stimulation/src/box-algorithms/ovpCBoxAlgorithmP300SpellerStimulator.h b/trunk2/core/plugins/algorithms/stimulation/src/box-algorithms/ovpCBoxAlgorithmP300SpellerStimulator.h similarity index 100% rename from trunk2/core/plugins/boxes/stimulation/src/box-algorithms/ovpCBoxAlgorithmP300SpellerStimulator.h rename to trunk2/core/plugins/algorithms/stimulation/src/box-algorithms/ovpCBoxAlgorithmP300SpellerStimulator.h diff --git a/trunk2/core/plugins/boxes/stimulation/src/box-algorithms/ovpCBoxAlgorithmPlayerController.cpp b/trunk2/core/plugins/algorithms/stimulation/src/box-algorithms/ovpCBoxAlgorithmPlayerController.cpp similarity index 100% rename from trunk2/core/plugins/boxes/stimulation/src/box-algorithms/ovpCBoxAlgorithmPlayerController.cpp rename to trunk2/core/plugins/algorithms/stimulation/src/box-algorithms/ovpCBoxAlgorithmPlayerController.cpp diff --git a/trunk2/core/plugins/boxes/stimulation/src/box-algorithms/ovpCBoxAlgorithmPlayerController.h b/trunk2/core/plugins/algorithms/stimulation/src/box-algorithms/ovpCBoxAlgorithmPlayerController.h similarity index 100% rename from trunk2/core/plugins/boxes/stimulation/src/box-algorithms/ovpCBoxAlgorithmPlayerController.h rename to trunk2/core/plugins/algorithms/stimulation/src/box-algorithms/ovpCBoxAlgorithmPlayerController.h diff --git a/trunk2/core/plugins/boxes/stimulation/src/box-algorithms/ovpCBoxAlgorithmRunCommand.cpp b/trunk2/core/plugins/algorithms/stimulation/src/box-algorithms/ovpCBoxAlgorithmRunCommand.cpp similarity index 100% rename from trunk2/core/plugins/boxes/stimulation/src/box-algorithms/ovpCBoxAlgorithmRunCommand.cpp rename to trunk2/core/plugins/algorithms/stimulation/src/box-algorithms/ovpCBoxAlgorithmRunCommand.cpp diff --git a/trunk2/core/plugins/boxes/stimulation/src/box-algorithms/ovpCBoxAlgorithmRunCommand.h b/trunk2/core/plugins/algorithms/stimulation/src/box-algorithms/ovpCBoxAlgorithmRunCommand.h similarity index 100% rename from trunk2/core/plugins/boxes/stimulation/src/box-algorithms/ovpCBoxAlgorithmRunCommand.h rename to trunk2/core/plugins/algorithms/stimulation/src/box-algorithms/ovpCBoxAlgorithmRunCommand.h diff --git a/trunk2/core/plugins/boxes/stimulation/src/box-algorithms/ovpCBoxAlgorithmSoundPlayer.cpp b/trunk2/core/plugins/algorithms/stimulation/src/box-algorithms/ovpCBoxAlgorithmSoundPlayer.cpp similarity index 100% rename from trunk2/core/plugins/boxes/stimulation/src/box-algorithms/ovpCBoxAlgorithmSoundPlayer.cpp rename to trunk2/core/plugins/algorithms/stimulation/src/box-algorithms/ovpCBoxAlgorithmSoundPlayer.cpp diff --git a/trunk2/core/plugins/boxes/stimulation/src/box-algorithms/ovpCBoxAlgorithmSoundPlayer.h b/trunk2/core/plugins/algorithms/stimulation/src/box-algorithms/ovpCBoxAlgorithmSoundPlayer.h similarity index 100% rename from trunk2/core/plugins/boxes/stimulation/src/box-algorithms/ovpCBoxAlgorithmSoundPlayer.h rename to trunk2/core/plugins/algorithms/stimulation/src/box-algorithms/ovpCBoxAlgorithmSoundPlayer.h diff --git a/trunk2/core/plugins/boxes/stimulation/src/box-algorithms/ovpCBoxAlgorithmStimulationMultiplexer.cpp b/trunk2/core/plugins/algorithms/stimulation/src/box-algorithms/ovpCBoxAlgorithmStimulationMultiplexer.cpp similarity index 100% rename from trunk2/core/plugins/boxes/stimulation/src/box-algorithms/ovpCBoxAlgorithmStimulationMultiplexer.cpp rename to trunk2/core/plugins/algorithms/stimulation/src/box-algorithms/ovpCBoxAlgorithmStimulationMultiplexer.cpp diff --git a/trunk2/core/plugins/boxes/stimulation/src/box-algorithms/ovpCBoxAlgorithmStimulationMultiplexer.h b/trunk2/core/plugins/algorithms/stimulation/src/box-algorithms/ovpCBoxAlgorithmStimulationMultiplexer.h similarity index 100% rename from trunk2/core/plugins/boxes/stimulation/src/box-algorithms/ovpCBoxAlgorithmStimulationMultiplexer.h rename to trunk2/core/plugins/algorithms/stimulation/src/box-algorithms/ovpCBoxAlgorithmStimulationMultiplexer.h diff --git a/trunk2/core/plugins/boxes/stimulation/src/box-algorithms/ovpCBoxAlgorithmStimulationVoter.cpp b/trunk2/core/plugins/algorithms/stimulation/src/box-algorithms/ovpCBoxAlgorithmStimulationVoter.cpp similarity index 100% rename from trunk2/core/plugins/boxes/stimulation/src/box-algorithms/ovpCBoxAlgorithmStimulationVoter.cpp rename to trunk2/core/plugins/algorithms/stimulation/src/box-algorithms/ovpCBoxAlgorithmStimulationVoter.cpp diff --git a/trunk2/core/plugins/boxes/stimulation/src/box-algorithms/ovpCBoxAlgorithmStimulationVoter.h b/trunk2/core/plugins/algorithms/stimulation/src/box-algorithms/ovpCBoxAlgorithmStimulationVoter.h similarity index 100% rename from trunk2/core/plugins/boxes/stimulation/src/box-algorithms/ovpCBoxAlgorithmStimulationVoter.h rename to trunk2/core/plugins/algorithms/stimulation/src/box-algorithms/ovpCBoxAlgorithmStimulationVoter.h diff --git a/trunk2/core/plugins/boxes/stimulation/src/box-algorithms/ovpCBoxAlgorithmTimeout.cpp b/trunk2/core/plugins/algorithms/stimulation/src/box-algorithms/ovpCBoxAlgorithmTimeout.cpp similarity index 100% rename from trunk2/core/plugins/boxes/stimulation/src/box-algorithms/ovpCBoxAlgorithmTimeout.cpp rename to trunk2/core/plugins/algorithms/stimulation/src/box-algorithms/ovpCBoxAlgorithmTimeout.cpp diff --git a/trunk2/core/plugins/boxes/stimulation/src/box-algorithms/ovpCBoxAlgorithmTimeout.h b/trunk2/core/plugins/algorithms/stimulation/src/box-algorithms/ovpCBoxAlgorithmTimeout.h similarity index 100% rename from trunk2/core/plugins/boxes/stimulation/src/box-algorithms/ovpCBoxAlgorithmTimeout.h rename to trunk2/core/plugins/algorithms/stimulation/src/box-algorithms/ovpCBoxAlgorithmTimeout.h diff --git a/trunk2/core/plugins/boxes/stimulation/src/box-algorithms/ovpCKeyboardStimulator.cpp b/trunk2/core/plugins/algorithms/stimulation/src/box-algorithms/ovpCKeyboardStimulator.cpp similarity index 100% rename from trunk2/core/plugins/boxes/stimulation/src/box-algorithms/ovpCKeyboardStimulator.cpp rename to trunk2/core/plugins/algorithms/stimulation/src/box-algorithms/ovpCKeyboardStimulator.cpp diff --git a/trunk2/core/plugins/boxes/stimulation/src/box-algorithms/ovpCKeyboardStimulator.h b/trunk2/core/plugins/algorithms/stimulation/src/box-algorithms/ovpCKeyboardStimulator.h similarity index 100% rename from trunk2/core/plugins/boxes/stimulation/src/box-algorithms/ovpCKeyboardStimulator.h rename to trunk2/core/plugins/algorithms/stimulation/src/box-algorithms/ovpCKeyboardStimulator.h diff --git a/trunk2/core/plugins/boxes/stimulation/src/box-algorithms/ovpCSignChangeDetector.cpp b/trunk2/core/plugins/algorithms/stimulation/src/box-algorithms/ovpCSignChangeDetector.cpp similarity index 100% rename from trunk2/core/plugins/boxes/stimulation/src/box-algorithms/ovpCSignChangeDetector.cpp rename to trunk2/core/plugins/algorithms/stimulation/src/box-algorithms/ovpCSignChangeDetector.cpp diff --git a/trunk2/core/plugins/boxes/stimulation/src/box-algorithms/ovpCSignChangeDetector.h b/trunk2/core/plugins/algorithms/stimulation/src/box-algorithms/ovpCSignChangeDetector.h similarity index 100% rename from trunk2/core/plugins/boxes/stimulation/src/box-algorithms/ovpCSignChangeDetector.h rename to trunk2/core/plugins/algorithms/stimulation/src/box-algorithms/ovpCSignChangeDetector.h diff --git a/trunk2/core/plugins/boxes/stimulation/src/box-algorithms/ovpCXMLStimulationScenarioPlayer.cpp b/trunk2/core/plugins/algorithms/stimulation/src/box-algorithms/ovpCXMLStimulationScenarioPlayer.cpp similarity index 100% rename from trunk2/core/plugins/boxes/stimulation/src/box-algorithms/ovpCXMLStimulationScenarioPlayer.cpp rename to trunk2/core/plugins/algorithms/stimulation/src/box-algorithms/ovpCXMLStimulationScenarioPlayer.cpp diff --git a/trunk2/core/plugins/boxes/stimulation/src/box-algorithms/ovpCXMLStimulationScenarioPlayer.h b/trunk2/core/plugins/algorithms/stimulation/src/box-algorithms/ovpCXMLStimulationScenarioPlayer.h similarity index 100% rename from trunk2/core/plugins/boxes/stimulation/src/box-algorithms/ovpCXMLStimulationScenarioPlayer.h rename to trunk2/core/plugins/algorithms/stimulation/src/box-algorithms/ovpCXMLStimulationScenarioPlayer.h diff --git a/trunk2/core/plugins/boxes/stimulation/src/ovp_defines.h b/trunk2/core/plugins/algorithms/stimulation/src/ovp_defines.h similarity index 100% rename from trunk2/core/plugins/boxes/stimulation/src/ovp_defines.h rename to trunk2/core/plugins/algorithms/stimulation/src/ovp_defines.h diff --git a/trunk2/core/plugins/boxes/stimulation/src/ovp_main.cpp b/trunk2/core/plugins/algorithms/stimulation/src/ovp_main.cpp similarity index 100% rename from trunk2/core/plugins/boxes/stimulation/src/ovp_main.cpp rename to trunk2/core/plugins/algorithms/stimulation/src/ovp_main.cpp diff --git a/trunk2/core/plugins/boxes/stimulation/test/1secSinusOscillator.csv b/trunk2/core/plugins/algorithms/stimulation/test/1secSinusOscillator.csv similarity index 100% rename from trunk2/core/plugins/boxes/stimulation/test/1secSinusOscillator.csv rename to trunk2/core/plugins/algorithms/stimulation/test/1secSinusOscillator.csv diff --git a/trunk2/core/plugins/boxes/stimulation/test/DartTestfile.txt b/trunk2/core/plugins/algorithms/stimulation/test/DartTestfile.txt similarity index 100% rename from trunk2/core/plugins/boxes/stimulation/test/DartTestfile.txt rename to trunk2/core/plugins/algorithms/stimulation/test/DartTestfile.txt diff --git a/trunk2/core/plugins/boxes/stimulation/test/run-command.xml b/trunk2/core/plugins/algorithms/stimulation/test/run-command.xml similarity index 100% rename from trunk2/core/plugins/boxes/stimulation/test/run-command.xml rename to trunk2/core/plugins/algorithms/stimulation/test/run-command.xml diff --git a/trunk2/core/plugins/boxes/stimulation/test/timeout.xml b/trunk2/core/plugins/algorithms/stimulation/test/timeout.xml similarity index 100% rename from trunk2/core/plugins/boxes/stimulation/test/timeout.xml rename to trunk2/core/plugins/algorithms/stimulation/test/timeout.xml diff --git a/trunk2/core/plugins/boxes/stream-codecs/CMakeLists.txt b/trunk2/core/plugins/algorithms/stream-codecs/CMakeLists.txt similarity index 100% rename from trunk2/core/plugins/boxes/stream-codecs/CMakeLists.txt rename to trunk2/core/plugins/algorithms/stream-codecs/CMakeLists.txt diff --git a/trunk2/core/plugins/boxes/stream-codecs/src/algorithms/decoders/ovpCAcquisitionDecoder.cpp b/trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/decoders/ovpCAcquisitionDecoder.cpp similarity index 100% rename from trunk2/core/plugins/boxes/stream-codecs/src/algorithms/decoders/ovpCAcquisitionDecoder.cpp rename to trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/decoders/ovpCAcquisitionDecoder.cpp diff --git a/trunk2/core/plugins/boxes/stream-codecs/src/algorithms/decoders/ovpCAcquisitionDecoder.h b/trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/decoders/ovpCAcquisitionDecoder.h similarity index 100% rename from trunk2/core/plugins/boxes/stream-codecs/src/algorithms/decoders/ovpCAcquisitionDecoder.h rename to trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/decoders/ovpCAcquisitionDecoder.h diff --git a/trunk2/core/plugins/boxes/stream-codecs/src/algorithms/decoders/ovpCChannelLocalisationDecoder.cpp b/trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/decoders/ovpCChannelLocalisationDecoder.cpp similarity index 100% rename from trunk2/core/plugins/boxes/stream-codecs/src/algorithms/decoders/ovpCChannelLocalisationDecoder.cpp rename to trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/decoders/ovpCChannelLocalisationDecoder.cpp diff --git a/trunk2/core/plugins/boxes/stream-codecs/src/algorithms/decoders/ovpCChannelLocalisationDecoder.h b/trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/decoders/ovpCChannelLocalisationDecoder.h similarity index 100% rename from trunk2/core/plugins/boxes/stream-codecs/src/algorithms/decoders/ovpCChannelLocalisationDecoder.h rename to trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/decoders/ovpCChannelLocalisationDecoder.h diff --git a/trunk2/core/plugins/boxes/stream-codecs/src/algorithms/decoders/ovpCEBMLBaseDecoder.cpp b/trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/decoders/ovpCEBMLBaseDecoder.cpp similarity index 100% rename from trunk2/core/plugins/boxes/stream-codecs/src/algorithms/decoders/ovpCEBMLBaseDecoder.cpp rename to trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/decoders/ovpCEBMLBaseDecoder.cpp diff --git a/trunk2/core/plugins/boxes/stream-codecs/src/algorithms/decoders/ovpCEBMLBaseDecoder.h b/trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/decoders/ovpCEBMLBaseDecoder.h similarity index 100% rename from trunk2/core/plugins/boxes/stream-codecs/src/algorithms/decoders/ovpCEBMLBaseDecoder.h rename to trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/decoders/ovpCEBMLBaseDecoder.h diff --git a/trunk2/core/plugins/boxes/stream-codecs/src/algorithms/decoders/ovpCExperimentInformationDecoder.cpp b/trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/decoders/ovpCExperimentInformationDecoder.cpp similarity index 100% rename from trunk2/core/plugins/boxes/stream-codecs/src/algorithms/decoders/ovpCExperimentInformationDecoder.cpp rename to trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/decoders/ovpCExperimentInformationDecoder.cpp diff --git a/trunk2/core/plugins/boxes/stream-codecs/src/algorithms/decoders/ovpCExperimentInformationDecoder.h b/trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/decoders/ovpCExperimentInformationDecoder.h similarity index 100% rename from trunk2/core/plugins/boxes/stream-codecs/src/algorithms/decoders/ovpCExperimentInformationDecoder.h rename to trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/decoders/ovpCExperimentInformationDecoder.h diff --git a/trunk2/core/plugins/boxes/stream-codecs/src/algorithms/decoders/ovpCFeatureVectorDecoder.cpp b/trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/decoders/ovpCFeatureVectorDecoder.cpp similarity index 100% rename from trunk2/core/plugins/boxes/stream-codecs/src/algorithms/decoders/ovpCFeatureVectorDecoder.cpp rename to trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/decoders/ovpCFeatureVectorDecoder.cpp diff --git a/trunk2/core/plugins/boxes/stream-codecs/src/algorithms/decoders/ovpCFeatureVectorDecoder.h b/trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/decoders/ovpCFeatureVectorDecoder.h similarity index 100% rename from trunk2/core/plugins/boxes/stream-codecs/src/algorithms/decoders/ovpCFeatureVectorDecoder.h rename to trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/decoders/ovpCFeatureVectorDecoder.h diff --git a/trunk2/core/plugins/boxes/stream-codecs/src/algorithms/decoders/ovpCSignalDecoder.cpp b/trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/decoders/ovpCSignalDecoder.cpp similarity index 100% rename from trunk2/core/plugins/boxes/stream-codecs/src/algorithms/decoders/ovpCSignalDecoder.cpp rename to trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/decoders/ovpCSignalDecoder.cpp diff --git a/trunk2/core/plugins/boxes/stream-codecs/src/algorithms/decoders/ovpCSignalDecoder.h b/trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/decoders/ovpCSignalDecoder.h similarity index 100% rename from trunk2/core/plugins/boxes/stream-codecs/src/algorithms/decoders/ovpCSignalDecoder.h rename to trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/decoders/ovpCSignalDecoder.h diff --git a/trunk2/core/plugins/boxes/stream-codecs/src/algorithms/decoders/ovpCSpectrumDecoder.cpp b/trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/decoders/ovpCSpectrumDecoder.cpp similarity index 100% rename from trunk2/core/plugins/boxes/stream-codecs/src/algorithms/decoders/ovpCSpectrumDecoder.cpp rename to trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/decoders/ovpCSpectrumDecoder.cpp diff --git a/trunk2/core/plugins/boxes/stream-codecs/src/algorithms/decoders/ovpCSpectrumDecoder.h b/trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/decoders/ovpCSpectrumDecoder.h similarity index 100% rename from trunk2/core/plugins/boxes/stream-codecs/src/algorithms/decoders/ovpCSpectrumDecoder.h rename to trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/decoders/ovpCSpectrumDecoder.h diff --git a/trunk2/core/plugins/boxes/stream-codecs/src/algorithms/decoders/ovpCStimulationDecoder.cpp b/trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/decoders/ovpCStimulationDecoder.cpp similarity index 100% rename from trunk2/core/plugins/boxes/stream-codecs/src/algorithms/decoders/ovpCStimulationDecoder.cpp rename to trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/decoders/ovpCStimulationDecoder.cpp diff --git a/trunk2/core/plugins/boxes/stream-codecs/src/algorithms/decoders/ovpCStimulationDecoder.h b/trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/decoders/ovpCStimulationDecoder.h similarity index 100% rename from trunk2/core/plugins/boxes/stream-codecs/src/algorithms/decoders/ovpCStimulationDecoder.h rename to trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/decoders/ovpCStimulationDecoder.h diff --git a/trunk2/core/plugins/boxes/stream-codecs/src/algorithms/decoders/ovpCStreamedMatrixDecoder.cpp b/trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/decoders/ovpCStreamedMatrixDecoder.cpp similarity index 100% rename from trunk2/core/plugins/boxes/stream-codecs/src/algorithms/decoders/ovpCStreamedMatrixDecoder.cpp rename to trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/decoders/ovpCStreamedMatrixDecoder.cpp diff --git a/trunk2/core/plugins/boxes/stream-codecs/src/algorithms/decoders/ovpCStreamedMatrixDecoder.h b/trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/decoders/ovpCStreamedMatrixDecoder.h similarity index 100% rename from trunk2/core/plugins/boxes/stream-codecs/src/algorithms/decoders/ovpCStreamedMatrixDecoder.h rename to trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/decoders/ovpCStreamedMatrixDecoder.h diff --git a/trunk2/core/plugins/boxes/stream-codecs/src/algorithms/encoders/ovpCAcquisitionEncoder.cpp b/trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/encoders/ovpCAcquisitionEncoder.cpp similarity index 100% rename from trunk2/core/plugins/boxes/stream-codecs/src/algorithms/encoders/ovpCAcquisitionEncoder.cpp rename to trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/encoders/ovpCAcquisitionEncoder.cpp diff --git a/trunk2/core/plugins/boxes/stream-codecs/src/algorithms/encoders/ovpCAcquisitionEncoder.h b/trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/encoders/ovpCAcquisitionEncoder.h similarity index 100% rename from trunk2/core/plugins/boxes/stream-codecs/src/algorithms/encoders/ovpCAcquisitionEncoder.h rename to trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/encoders/ovpCAcquisitionEncoder.h diff --git a/trunk2/core/plugins/boxes/stream-codecs/src/algorithms/encoders/ovpCChannelLocalisationEncoder.cpp b/trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/encoders/ovpCChannelLocalisationEncoder.cpp similarity index 100% rename from trunk2/core/plugins/boxes/stream-codecs/src/algorithms/encoders/ovpCChannelLocalisationEncoder.cpp rename to trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/encoders/ovpCChannelLocalisationEncoder.cpp diff --git a/trunk2/core/plugins/boxes/stream-codecs/src/algorithms/encoders/ovpCChannelLocalisationEncoder.h b/trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/encoders/ovpCChannelLocalisationEncoder.h similarity index 100% rename from trunk2/core/plugins/boxes/stream-codecs/src/algorithms/encoders/ovpCChannelLocalisationEncoder.h rename to trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/encoders/ovpCChannelLocalisationEncoder.h diff --git a/trunk2/core/plugins/boxes/stream-codecs/src/algorithms/encoders/ovpCEBMLBaseEncoder.cpp b/trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/encoders/ovpCEBMLBaseEncoder.cpp similarity index 100% rename from trunk2/core/plugins/boxes/stream-codecs/src/algorithms/encoders/ovpCEBMLBaseEncoder.cpp rename to trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/encoders/ovpCEBMLBaseEncoder.cpp diff --git a/trunk2/core/plugins/boxes/stream-codecs/src/algorithms/encoders/ovpCEBMLBaseEncoder.h b/trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/encoders/ovpCEBMLBaseEncoder.h similarity index 100% rename from trunk2/core/plugins/boxes/stream-codecs/src/algorithms/encoders/ovpCEBMLBaseEncoder.h rename to trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/encoders/ovpCEBMLBaseEncoder.h diff --git a/trunk2/core/plugins/boxes/stream-codecs/src/algorithms/encoders/ovpCExperimentInformationEncoder.cpp b/trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/encoders/ovpCExperimentInformationEncoder.cpp similarity index 100% rename from trunk2/core/plugins/boxes/stream-codecs/src/algorithms/encoders/ovpCExperimentInformationEncoder.cpp rename to trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/encoders/ovpCExperimentInformationEncoder.cpp diff --git a/trunk2/core/plugins/boxes/stream-codecs/src/algorithms/encoders/ovpCExperimentInformationEncoder.h b/trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/encoders/ovpCExperimentInformationEncoder.h similarity index 100% rename from trunk2/core/plugins/boxes/stream-codecs/src/algorithms/encoders/ovpCExperimentInformationEncoder.h rename to trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/encoders/ovpCExperimentInformationEncoder.h diff --git a/trunk2/core/plugins/boxes/stream-codecs/src/algorithms/encoders/ovpCFeatureVectorEncoder.cpp b/trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/encoders/ovpCFeatureVectorEncoder.cpp similarity index 100% rename from trunk2/core/plugins/boxes/stream-codecs/src/algorithms/encoders/ovpCFeatureVectorEncoder.cpp rename to trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/encoders/ovpCFeatureVectorEncoder.cpp diff --git a/trunk2/core/plugins/boxes/stream-codecs/src/algorithms/encoders/ovpCFeatureVectorEncoder.h b/trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/encoders/ovpCFeatureVectorEncoder.h similarity index 100% rename from trunk2/core/plugins/boxes/stream-codecs/src/algorithms/encoders/ovpCFeatureVectorEncoder.h rename to trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/encoders/ovpCFeatureVectorEncoder.h diff --git a/trunk2/core/plugins/boxes/stream-codecs/src/algorithms/encoders/ovpCMasterAcquisitionEncoder.cpp b/trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/encoders/ovpCMasterAcquisitionEncoder.cpp similarity index 100% rename from trunk2/core/plugins/boxes/stream-codecs/src/algorithms/encoders/ovpCMasterAcquisitionEncoder.cpp rename to trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/encoders/ovpCMasterAcquisitionEncoder.cpp diff --git a/trunk2/core/plugins/boxes/stream-codecs/src/algorithms/encoders/ovpCMasterAcquisitionEncoder.h b/trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/encoders/ovpCMasterAcquisitionEncoder.h similarity index 100% rename from trunk2/core/plugins/boxes/stream-codecs/src/algorithms/encoders/ovpCMasterAcquisitionEncoder.h rename to trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/encoders/ovpCMasterAcquisitionEncoder.h diff --git a/trunk2/core/plugins/boxes/stream-codecs/src/algorithms/encoders/ovpCSignalEncoder.cpp b/trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/encoders/ovpCSignalEncoder.cpp similarity index 100% rename from trunk2/core/plugins/boxes/stream-codecs/src/algorithms/encoders/ovpCSignalEncoder.cpp rename to trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/encoders/ovpCSignalEncoder.cpp diff --git a/trunk2/core/plugins/boxes/stream-codecs/src/algorithms/encoders/ovpCSignalEncoder.h b/trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/encoders/ovpCSignalEncoder.h similarity index 100% rename from trunk2/core/plugins/boxes/stream-codecs/src/algorithms/encoders/ovpCSignalEncoder.h rename to trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/encoders/ovpCSignalEncoder.h diff --git a/trunk2/core/plugins/boxes/stream-codecs/src/algorithms/encoders/ovpCSpectrumEncoder.cpp b/trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/encoders/ovpCSpectrumEncoder.cpp similarity index 100% rename from trunk2/core/plugins/boxes/stream-codecs/src/algorithms/encoders/ovpCSpectrumEncoder.cpp rename to trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/encoders/ovpCSpectrumEncoder.cpp diff --git a/trunk2/core/plugins/boxes/stream-codecs/src/algorithms/encoders/ovpCSpectrumEncoder.h b/trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/encoders/ovpCSpectrumEncoder.h similarity index 100% rename from trunk2/core/plugins/boxes/stream-codecs/src/algorithms/encoders/ovpCSpectrumEncoder.h rename to trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/encoders/ovpCSpectrumEncoder.h diff --git a/trunk2/core/plugins/boxes/stream-codecs/src/algorithms/encoders/ovpCStimulationEncoder.cpp b/trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/encoders/ovpCStimulationEncoder.cpp similarity index 100% rename from trunk2/core/plugins/boxes/stream-codecs/src/algorithms/encoders/ovpCStimulationEncoder.cpp rename to trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/encoders/ovpCStimulationEncoder.cpp diff --git a/trunk2/core/plugins/boxes/stream-codecs/src/algorithms/encoders/ovpCStimulationEncoder.h b/trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/encoders/ovpCStimulationEncoder.h similarity index 100% rename from trunk2/core/plugins/boxes/stream-codecs/src/algorithms/encoders/ovpCStimulationEncoder.h rename to trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/encoders/ovpCStimulationEncoder.h diff --git a/trunk2/core/plugins/boxes/stream-codecs/src/algorithms/encoders/ovpCStreamedMatrixEncoder.cpp b/trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/encoders/ovpCStreamedMatrixEncoder.cpp similarity index 100% rename from trunk2/core/plugins/boxes/stream-codecs/src/algorithms/encoders/ovpCStreamedMatrixEncoder.cpp rename to trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/encoders/ovpCStreamedMatrixEncoder.cpp diff --git a/trunk2/core/plugins/boxes/stream-codecs/src/algorithms/encoders/ovpCStreamedMatrixEncoder.h b/trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/encoders/ovpCStreamedMatrixEncoder.h similarity index 100% rename from trunk2/core/plugins/boxes/stream-codecs/src/algorithms/encoders/ovpCStreamedMatrixEncoder.h rename to trunk2/core/plugins/algorithms/stream-codecs/src/algorithms/encoders/ovpCStreamedMatrixEncoder.h diff --git a/trunk2/core/plugins/boxes/stream-codecs/src/box-algorithms/ovpCDecoderAlgorithmTest.cpp b/trunk2/core/plugins/algorithms/stream-codecs/src/box-algorithms/ovpCDecoderAlgorithmTest.cpp similarity index 100% rename from trunk2/core/plugins/boxes/stream-codecs/src/box-algorithms/ovpCDecoderAlgorithmTest.cpp rename to trunk2/core/plugins/algorithms/stream-codecs/src/box-algorithms/ovpCDecoderAlgorithmTest.cpp diff --git a/trunk2/core/plugins/boxes/stream-codecs/src/box-algorithms/ovpCDecoderAlgorithmTest.h b/trunk2/core/plugins/algorithms/stream-codecs/src/box-algorithms/ovpCDecoderAlgorithmTest.h similarity index 100% rename from trunk2/core/plugins/boxes/stream-codecs/src/box-algorithms/ovpCDecoderAlgorithmTest.h rename to trunk2/core/plugins/algorithms/stream-codecs/src/box-algorithms/ovpCDecoderAlgorithmTest.h diff --git a/trunk2/core/plugins/boxes/stream-codecs/src/box-algorithms/ovpCEncoderAlgorithmTest.cpp b/trunk2/core/plugins/algorithms/stream-codecs/src/box-algorithms/ovpCEncoderAlgorithmTest.cpp similarity index 100% rename from trunk2/core/plugins/boxes/stream-codecs/src/box-algorithms/ovpCEncoderAlgorithmTest.cpp rename to trunk2/core/plugins/algorithms/stream-codecs/src/box-algorithms/ovpCEncoderAlgorithmTest.cpp diff --git a/trunk2/core/plugins/boxes/stream-codecs/src/box-algorithms/ovpCEncoderAlgorithmTest.h b/trunk2/core/plugins/algorithms/stream-codecs/src/box-algorithms/ovpCEncoderAlgorithmTest.h similarity index 100% rename from trunk2/core/plugins/boxes/stream-codecs/src/box-algorithms/ovpCEncoderAlgorithmTest.h rename to trunk2/core/plugins/algorithms/stream-codecs/src/box-algorithms/ovpCEncoderAlgorithmTest.h diff --git a/trunk2/core/plugins/boxes/stream-codecs/src/ovp_defines.h b/trunk2/core/plugins/algorithms/stream-codecs/src/ovp_defines.h similarity index 100% rename from trunk2/core/plugins/boxes/stream-codecs/src/ovp_defines.h rename to trunk2/core/plugins/algorithms/stream-codecs/src/ovp_defines.h diff --git a/trunk2/core/plugins/boxes/stream-codecs/src/ovp_main.cpp b/trunk2/core/plugins/algorithms/stream-codecs/src/ovp_main.cpp similarity index 100% rename from trunk2/core/plugins/boxes/stream-codecs/src/ovp_main.cpp rename to trunk2/core/plugins/algorithms/stream-codecs/src/ovp_main.cpp diff --git a/trunk2/core/plugins/boxes/streaming/CMakeLists.txt b/trunk2/core/plugins/algorithms/streaming/CMakeLists.txt similarity index 100% rename from trunk2/core/plugins/boxes/streaming/CMakeLists.txt rename to trunk2/core/plugins/algorithms/streaming/CMakeLists.txt diff --git a/trunk2/core/plugins/boxes/streaming/doc/Doc_BoxAlgorithm_SignalMerger.dox-part b/trunk2/core/plugins/algorithms/streaming/doc/Doc_BoxAlgorithm_SignalMerger.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/streaming/doc/Doc_BoxAlgorithm_SignalMerger.dox-part rename to trunk2/core/plugins/algorithms/streaming/doc/Doc_BoxAlgorithm_SignalMerger.dox-part diff --git a/trunk2/core/plugins/boxes/streaming/doc/Doc_BoxAlgorithm_StreamSwitch.dox-part b/trunk2/core/plugins/algorithms/streaming/doc/Doc_BoxAlgorithm_StreamSwitch.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/streaming/doc/Doc_BoxAlgorithm_StreamSwitch.dox-part rename to trunk2/core/plugins/algorithms/streaming/doc/Doc_BoxAlgorithm_StreamSwitch.dox-part diff --git a/trunk2/core/plugins/boxes/streaming/doc/Doc_BoxAlgorithm_StreamedMatrixMultiplexer.dox-part b/trunk2/core/plugins/algorithms/streaming/doc/Doc_BoxAlgorithm_StreamedMatrixMultiplexer.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/streaming/doc/Doc_BoxAlgorithm_StreamedMatrixMultiplexer.dox-part rename to trunk2/core/plugins/algorithms/streaming/doc/Doc_BoxAlgorithm_StreamedMatrixMultiplexer.dox-part diff --git a/trunk2/core/plugins/boxes/streaming/src/box-algorithms/ovpCBoxAlgorithmSignalMerger.cpp b/trunk2/core/plugins/algorithms/streaming/src/box-algorithms/ovpCBoxAlgorithmSignalMerger.cpp similarity index 100% rename from trunk2/core/plugins/boxes/streaming/src/box-algorithms/ovpCBoxAlgorithmSignalMerger.cpp rename to trunk2/core/plugins/algorithms/streaming/src/box-algorithms/ovpCBoxAlgorithmSignalMerger.cpp diff --git a/trunk2/core/plugins/boxes/streaming/src/box-algorithms/ovpCBoxAlgorithmSignalMerger.h b/trunk2/core/plugins/algorithms/streaming/src/box-algorithms/ovpCBoxAlgorithmSignalMerger.h similarity index 100% rename from trunk2/core/plugins/boxes/streaming/src/box-algorithms/ovpCBoxAlgorithmSignalMerger.h rename to trunk2/core/plugins/algorithms/streaming/src/box-algorithms/ovpCBoxAlgorithmSignalMerger.h diff --git a/trunk2/core/plugins/boxes/streaming/src/box-algorithms/ovpCBoxAlgorithmStreamedMatrixMultiplexer.cpp b/trunk2/core/plugins/algorithms/streaming/src/box-algorithms/ovpCBoxAlgorithmStreamedMatrixMultiplexer.cpp similarity index 100% rename from trunk2/core/plugins/boxes/streaming/src/box-algorithms/ovpCBoxAlgorithmStreamedMatrixMultiplexer.cpp rename to trunk2/core/plugins/algorithms/streaming/src/box-algorithms/ovpCBoxAlgorithmStreamedMatrixMultiplexer.cpp diff --git a/trunk2/core/plugins/boxes/streaming/src/box-algorithms/ovpCBoxAlgorithmStreamedMatrixMultiplexer.h b/trunk2/core/plugins/algorithms/streaming/src/box-algorithms/ovpCBoxAlgorithmStreamedMatrixMultiplexer.h similarity index 100% rename from trunk2/core/plugins/boxes/streaming/src/box-algorithms/ovpCBoxAlgorithmStreamedMatrixMultiplexer.h rename to trunk2/core/plugins/algorithms/streaming/src/box-algorithms/ovpCBoxAlgorithmStreamedMatrixMultiplexer.h diff --git a/trunk2/core/plugins/boxes/streaming/src/box-algorithms/ovpCBoxAlgorithmStreamedMatrixSwitch.cpp b/trunk2/core/plugins/algorithms/streaming/src/box-algorithms/ovpCBoxAlgorithmStreamedMatrixSwitch.cpp similarity index 100% rename from trunk2/core/plugins/boxes/streaming/src/box-algorithms/ovpCBoxAlgorithmStreamedMatrixSwitch.cpp rename to trunk2/core/plugins/algorithms/streaming/src/box-algorithms/ovpCBoxAlgorithmStreamedMatrixSwitch.cpp diff --git a/trunk2/core/plugins/boxes/streaming/src/box-algorithms/ovpCBoxAlgorithmStreamedMatrixSwitch.h b/trunk2/core/plugins/algorithms/streaming/src/box-algorithms/ovpCBoxAlgorithmStreamedMatrixSwitch.h similarity index 100% rename from trunk2/core/plugins/boxes/streaming/src/box-algorithms/ovpCBoxAlgorithmStreamedMatrixSwitch.h rename to trunk2/core/plugins/algorithms/streaming/src/box-algorithms/ovpCBoxAlgorithmStreamedMatrixSwitch.h diff --git a/trunk2/core/plugins/boxes/streaming/src/ovp_defines.h b/trunk2/core/plugins/algorithms/streaming/src/ovp_defines.h similarity index 100% rename from trunk2/core/plugins/boxes/streaming/src/ovp_defines.h rename to trunk2/core/plugins/algorithms/streaming/src/ovp_defines.h diff --git a/trunk2/core/plugins/boxes/streaming/src/ovp_main.cpp b/trunk2/core/plugins/algorithms/streaming/src/ovp_main.cpp similarity index 100% rename from trunk2/core/plugins/boxes/streaming/src/ovp_main.cpp rename to trunk2/core/plugins/algorithms/streaming/src/ovp_main.cpp diff --git a/trunk2/core/plugins/boxes/tools/CMakeLists.txt b/trunk2/core/plugins/algorithms/tools/CMakeLists.txt similarity index 100% rename from trunk2/core/plugins/boxes/tools/CMakeLists.txt rename to trunk2/core/plugins/algorithms/tools/CMakeLists.txt diff --git a/trunk2/core/plugins/boxes/tools/doc/Doc_BoxAlgorithm_EBMLStreamSpy.dox-part b/trunk2/core/plugins/algorithms/tools/doc/Doc_BoxAlgorithm_EBMLStreamSpy.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/tools/doc/Doc_BoxAlgorithm_EBMLStreamSpy.dox-part rename to trunk2/core/plugins/algorithms/tools/doc/Doc_BoxAlgorithm_EBMLStreamSpy.dox-part diff --git a/trunk2/core/plugins/boxes/tools/doc/Doc_BoxAlgorithm_MatrixValidityChecker.dox-part b/trunk2/core/plugins/algorithms/tools/doc/Doc_BoxAlgorithm_MatrixValidityChecker.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/tools/doc/Doc_BoxAlgorithm_MatrixValidityChecker.dox-part rename to trunk2/core/plugins/algorithms/tools/doc/Doc_BoxAlgorithm_MatrixValidityChecker.dox-part diff --git a/trunk2/core/plugins/boxes/tools/doc/Doc_BoxAlgorithm_StimulationListener.dox-part b/trunk2/core/plugins/algorithms/tools/doc/Doc_BoxAlgorithm_StimulationListener.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/tools/doc/Doc_BoxAlgorithm_StimulationListener.dox-part rename to trunk2/core/plugins/algorithms/tools/doc/Doc_BoxAlgorithm_StimulationListener.dox-part diff --git a/trunk2/core/plugins/boxes/tools/share/config-ebml-stream-spy.txt b/trunk2/core/plugins/algorithms/tools/share/config-ebml-stream-spy.txt similarity index 100% rename from trunk2/core/plugins/boxes/tools/share/config-ebml-stream-spy.txt rename to trunk2/core/plugins/algorithms/tools/share/config-ebml-stream-spy.txt diff --git a/trunk2/core/plugins/boxes/tools/src/box-algorithms/ovpCBoxAlgorithmEBMLStreamSpy.cpp b/trunk2/core/plugins/algorithms/tools/src/box-algorithms/ovpCBoxAlgorithmEBMLStreamSpy.cpp similarity index 100% rename from trunk2/core/plugins/boxes/tools/src/box-algorithms/ovpCBoxAlgorithmEBMLStreamSpy.cpp rename to trunk2/core/plugins/algorithms/tools/src/box-algorithms/ovpCBoxAlgorithmEBMLStreamSpy.cpp diff --git a/trunk2/core/plugins/boxes/tools/src/box-algorithms/ovpCBoxAlgorithmEBMLStreamSpy.h b/trunk2/core/plugins/algorithms/tools/src/box-algorithms/ovpCBoxAlgorithmEBMLStreamSpy.h similarity index 100% rename from trunk2/core/plugins/boxes/tools/src/box-algorithms/ovpCBoxAlgorithmEBMLStreamSpy.h rename to trunk2/core/plugins/algorithms/tools/src/box-algorithms/ovpCBoxAlgorithmEBMLStreamSpy.h diff --git a/trunk2/core/plugins/boxes/tools/src/box-algorithms/ovpCBoxAlgorithmLatencyEvaluation.cpp b/trunk2/core/plugins/algorithms/tools/src/box-algorithms/ovpCBoxAlgorithmLatencyEvaluation.cpp similarity index 100% rename from trunk2/core/plugins/boxes/tools/src/box-algorithms/ovpCBoxAlgorithmLatencyEvaluation.cpp rename to trunk2/core/plugins/algorithms/tools/src/box-algorithms/ovpCBoxAlgorithmLatencyEvaluation.cpp diff --git a/trunk2/core/plugins/boxes/tools/src/box-algorithms/ovpCBoxAlgorithmLatencyEvaluation.h b/trunk2/core/plugins/algorithms/tools/src/box-algorithms/ovpCBoxAlgorithmLatencyEvaluation.h similarity index 100% rename from trunk2/core/plugins/boxes/tools/src/box-algorithms/ovpCBoxAlgorithmLatencyEvaluation.h rename to trunk2/core/plugins/algorithms/tools/src/box-algorithms/ovpCBoxAlgorithmLatencyEvaluation.h diff --git a/trunk2/core/plugins/boxes/tools/src/box-algorithms/ovpCBoxAlgorithmMatrixValidityChecker.cpp b/trunk2/core/plugins/algorithms/tools/src/box-algorithms/ovpCBoxAlgorithmMatrixValidityChecker.cpp similarity index 100% rename from trunk2/core/plugins/boxes/tools/src/box-algorithms/ovpCBoxAlgorithmMatrixValidityChecker.cpp rename to trunk2/core/plugins/algorithms/tools/src/box-algorithms/ovpCBoxAlgorithmMatrixValidityChecker.cpp diff --git a/trunk2/core/plugins/boxes/tools/src/box-algorithms/ovpCBoxAlgorithmMatrixValidityChecker.h b/trunk2/core/plugins/algorithms/tools/src/box-algorithms/ovpCBoxAlgorithmMatrixValidityChecker.h similarity index 100% rename from trunk2/core/plugins/boxes/tools/src/box-algorithms/ovpCBoxAlgorithmMatrixValidityChecker.h rename to trunk2/core/plugins/algorithms/tools/src/box-algorithms/ovpCBoxAlgorithmMatrixValidityChecker.h diff --git a/trunk2/core/plugins/boxes/tools/src/box-algorithms/ovpCBoxAlgorithmStimulationListener.cpp b/trunk2/core/plugins/algorithms/tools/src/box-algorithms/ovpCBoxAlgorithmStimulationListener.cpp similarity index 100% rename from trunk2/core/plugins/boxes/tools/src/box-algorithms/ovpCBoxAlgorithmStimulationListener.cpp rename to trunk2/core/plugins/algorithms/tools/src/box-algorithms/ovpCBoxAlgorithmStimulationListener.cpp diff --git a/trunk2/core/plugins/boxes/tools/src/box-algorithms/ovpCBoxAlgorithmStimulationListener.h b/trunk2/core/plugins/algorithms/tools/src/box-algorithms/ovpCBoxAlgorithmStimulationListener.h similarity index 100% rename from trunk2/core/plugins/boxes/tools/src/box-algorithms/ovpCBoxAlgorithmStimulationListener.h rename to trunk2/core/plugins/algorithms/tools/src/box-algorithms/ovpCBoxAlgorithmStimulationListener.h diff --git a/trunk2/core/plugins/boxes/tools/src/box-algorithms/ovpCMouseControl.cpp b/trunk2/core/plugins/algorithms/tools/src/box-algorithms/ovpCMouseControl.cpp similarity index 100% rename from trunk2/core/plugins/boxes/tools/src/box-algorithms/ovpCMouseControl.cpp rename to trunk2/core/plugins/algorithms/tools/src/box-algorithms/ovpCMouseControl.cpp diff --git a/trunk2/core/plugins/boxes/tools/src/box-algorithms/ovpCMouseControl.h b/trunk2/core/plugins/algorithms/tools/src/box-algorithms/ovpCMouseControl.h similarity index 100% rename from trunk2/core/plugins/boxes/tools/src/box-algorithms/ovpCMouseControl.h rename to trunk2/core/plugins/algorithms/tools/src/box-algorithms/ovpCMouseControl.h diff --git a/trunk2/core/plugins/boxes/tools/src/ovp_defines.h b/trunk2/core/plugins/algorithms/tools/src/ovp_defines.h similarity index 100% rename from trunk2/core/plugins/boxes/tools/src/ovp_defines.h rename to trunk2/core/plugins/algorithms/tools/src/ovp_defines.h diff --git a/trunk2/core/plugins/boxes/tools/src/ovp_main.cpp b/trunk2/core/plugins/algorithms/tools/src/ovp_main.cpp similarity index 100% rename from trunk2/core/plugins/boxes/tools/src/ovp_main.cpp rename to trunk2/core/plugins/algorithms/tools/src/ovp_main.cpp diff --git a/trunk2/core/plugins/boxes/turbofieldtrip/CMakeLists.txt b/trunk2/core/plugins/algorithms/turbofieldtrip/CMakeLists.txt similarity index 100% rename from trunk2/core/plugins/boxes/turbofieldtrip/CMakeLists.txt rename to trunk2/core/plugins/algorithms/turbofieldtrip/CMakeLists.txt diff --git a/trunk2/core/plugins/boxes/turbofieldtrip/src/ovp_defines.h b/trunk2/core/plugins/algorithms/turbofieldtrip/src/ovp_defines.h similarity index 100% rename from trunk2/core/plugins/boxes/turbofieldtrip/src/ovp_defines.h rename to trunk2/core/plugins/algorithms/turbofieldtrip/src/ovp_defines.h diff --git a/trunk2/core/plugins/boxes/turbofieldtrip/src/ovp_main.cpp b/trunk2/core/plugins/algorithms/turbofieldtrip/src/ovp_main.cpp similarity index 100% rename from trunk2/core/plugins/boxes/turbofieldtrip/src/ovp_main.cpp rename to trunk2/core/plugins/algorithms/turbofieldtrip/src/ovp_main.cpp diff --git a/trunk2/core/plugins/boxes/vrpn/CMakeLists.txt b/trunk2/core/plugins/algorithms/vrpn/CMakeLists.txt similarity index 100% rename from trunk2/core/plugins/boxes/vrpn/CMakeLists.txt rename to trunk2/core/plugins/algorithms/vrpn/CMakeLists.txt diff --git a/trunk2/core/plugins/boxes/vrpn/doc/BoxAlgorithm_AnalogVRPNServer.dox-part b/trunk2/core/plugins/algorithms/vrpn/doc/BoxAlgorithm_AnalogVRPNServer.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/vrpn/doc/BoxAlgorithm_AnalogVRPNServer.dox-part rename to trunk2/core/plugins/algorithms/vrpn/doc/BoxAlgorithm_AnalogVRPNServer.dox-part diff --git a/trunk2/core/plugins/boxes/vrpn/doc/BoxAlgorithm_ButtonVRPNServer.dox-part b/trunk2/core/plugins/algorithms/vrpn/doc/BoxAlgorithm_ButtonVRPNServer.dox-part similarity index 100% rename from trunk2/core/plugins/boxes/vrpn/doc/BoxAlgorithm_ButtonVRPNServer.dox-part rename to trunk2/core/plugins/algorithms/vrpn/doc/BoxAlgorithm_ButtonVRPNServer.dox-part diff --git a/trunk2/core/plugins/boxes/vrpn/src/box-algorithms/ovpCBoxAlgorithmVRPNAnalogClient.cpp b/trunk2/core/plugins/algorithms/vrpn/src/box-algorithms/ovpCBoxAlgorithmVRPNAnalogClient.cpp similarity index 100% rename from trunk2/core/plugins/boxes/vrpn/src/box-algorithms/ovpCBoxAlgorithmVRPNAnalogClient.cpp rename to trunk2/core/plugins/algorithms/vrpn/src/box-algorithms/ovpCBoxAlgorithmVRPNAnalogClient.cpp diff --git a/trunk2/core/plugins/boxes/vrpn/src/box-algorithms/ovpCBoxAlgorithmVRPNAnalogClient.h b/trunk2/core/plugins/algorithms/vrpn/src/box-algorithms/ovpCBoxAlgorithmVRPNAnalogClient.h similarity index 100% rename from trunk2/core/plugins/boxes/vrpn/src/box-algorithms/ovpCBoxAlgorithmVRPNAnalogClient.h rename to trunk2/core/plugins/algorithms/vrpn/src/box-algorithms/ovpCBoxAlgorithmVRPNAnalogClient.h diff --git a/trunk2/core/plugins/boxes/vrpn/src/box-algorithms/ovpCBoxAlgorithmVRPNButtonClient.cpp b/trunk2/core/plugins/algorithms/vrpn/src/box-algorithms/ovpCBoxAlgorithmVRPNButtonClient.cpp similarity index 100% rename from trunk2/core/plugins/boxes/vrpn/src/box-algorithms/ovpCBoxAlgorithmVRPNButtonClient.cpp rename to trunk2/core/plugins/algorithms/vrpn/src/box-algorithms/ovpCBoxAlgorithmVRPNButtonClient.cpp diff --git a/trunk2/core/plugins/boxes/vrpn/src/box-algorithms/ovpCBoxAlgorithmVRPNButtonClient.h b/trunk2/core/plugins/algorithms/vrpn/src/box-algorithms/ovpCBoxAlgorithmVRPNButtonClient.h similarity index 100% rename from trunk2/core/plugins/boxes/vrpn/src/box-algorithms/ovpCBoxAlgorithmVRPNButtonClient.h rename to trunk2/core/plugins/algorithms/vrpn/src/box-algorithms/ovpCBoxAlgorithmVRPNButtonClient.h diff --git a/trunk2/core/plugins/boxes/vrpn/src/box-algorithms/ovpCVRPNAnalogServer.cpp b/trunk2/core/plugins/algorithms/vrpn/src/box-algorithms/ovpCVRPNAnalogServer.cpp similarity index 100% rename from trunk2/core/plugins/boxes/vrpn/src/box-algorithms/ovpCVRPNAnalogServer.cpp rename to trunk2/core/plugins/algorithms/vrpn/src/box-algorithms/ovpCVRPNAnalogServer.cpp diff --git a/trunk2/core/plugins/boxes/vrpn/src/box-algorithms/ovpCVRPNAnalogServer.h b/trunk2/core/plugins/algorithms/vrpn/src/box-algorithms/ovpCVRPNAnalogServer.h similarity index 100% rename from trunk2/core/plugins/boxes/vrpn/src/box-algorithms/ovpCVRPNAnalogServer.h rename to trunk2/core/plugins/algorithms/vrpn/src/box-algorithms/ovpCVRPNAnalogServer.h diff --git a/trunk2/core/plugins/boxes/vrpn/src/box-algorithms/ovpCVRPNButtonServer.cpp b/trunk2/core/plugins/algorithms/vrpn/src/box-algorithms/ovpCVRPNButtonServer.cpp similarity index 100% rename from trunk2/core/plugins/boxes/vrpn/src/box-algorithms/ovpCVRPNButtonServer.cpp rename to trunk2/core/plugins/algorithms/vrpn/src/box-algorithms/ovpCVRPNButtonServer.cpp diff --git a/trunk2/core/plugins/boxes/vrpn/src/box-algorithms/ovpCVRPNButtonServer.h b/trunk2/core/plugins/algorithms/vrpn/src/box-algorithms/ovpCVRPNButtonServer.h similarity index 100% rename from trunk2/core/plugins/boxes/vrpn/src/box-algorithms/ovpCVRPNButtonServer.h rename to trunk2/core/plugins/algorithms/vrpn/src/box-algorithms/ovpCVRPNButtonServer.h diff --git a/trunk2/core/plugins/boxes/vrpn/src/ovpIVRPNServerManager.cpp b/trunk2/core/plugins/algorithms/vrpn/src/ovpIVRPNServerManager.cpp similarity index 100% rename from trunk2/core/plugins/boxes/vrpn/src/ovpIVRPNServerManager.cpp rename to trunk2/core/plugins/algorithms/vrpn/src/ovpIVRPNServerManager.cpp diff --git a/trunk2/core/plugins/boxes/vrpn/src/ovpIVRPNServerManager.h b/trunk2/core/plugins/algorithms/vrpn/src/ovpIVRPNServerManager.h similarity index 100% rename from trunk2/core/plugins/boxes/vrpn/src/ovpIVRPNServerManager.h rename to trunk2/core/plugins/algorithms/vrpn/src/ovpIVRPNServerManager.h diff --git a/trunk2/core/plugins/boxes/vrpn/src/ovp_defines.h b/trunk2/core/plugins/algorithms/vrpn/src/ovp_defines.h similarity index 100% rename from trunk2/core/plugins/boxes/vrpn/src/ovp_defines.h rename to trunk2/core/plugins/algorithms/vrpn/src/ovp_defines.h diff --git a/trunk2/core/plugins/boxes/vrpn/src/ovp_main.cpp b/trunk2/core/plugins/algorithms/vrpn/src/ovp_main.cpp similarity index 100% rename from trunk2/core/plugins/boxes/vrpn/src/ovp_main.cpp rename to trunk2/core/plugins/algorithms/vrpn/src/ovp_main.cpp