diff --git a/sapfor/experts/Sapfor_2017/CMakeLists.txt b/Sapfor/CMakeLists.txt
similarity index 100%
rename from sapfor/experts/Sapfor_2017/CMakeLists.txt
rename to Sapfor/CMakeLists.txt
diff --git a/sapfor/experts/Sapfor_2017/FDVM/CMakeLists.txt b/Sapfor/FDVM/CMakeLists.txt
similarity index 100%
rename from sapfor/experts/Sapfor_2017/FDVM/CMakeLists.txt
rename to Sapfor/FDVM/CMakeLists.txt
diff --git a/sapfor/experts/Sapfor_2017/Parser/CMakeLists.txt b/Sapfor/Parser/CMakeLists.txt
similarity index 100%
rename from sapfor/experts/Sapfor_2017/Parser/CMakeLists.txt
rename to Sapfor/Parser/CMakeLists.txt
diff --git a/sapfor/experts/Sapfor_2017/SageLib/CMakeLists.txt b/Sapfor/SageLib/CMakeLists.txt
similarity index 100%
rename from sapfor/experts/Sapfor_2017/SageLib/CMakeLists.txt
rename to Sapfor/SageLib/CMakeLists.txt
diff --git a/sapfor/experts/Sapfor_2017/SageNewSrc/CMakeLists.txt b/Sapfor/SageNewSrc/CMakeLists.txt
similarity index 100%
rename from sapfor/experts/Sapfor_2017/SageNewSrc/CMakeLists.txt
rename to Sapfor/SageNewSrc/CMakeLists.txt
diff --git a/sapfor/experts/Sapfor_2017/SageOldSrc/CMakeLists.txt b/Sapfor/SageOldSrc/CMakeLists.txt
similarity index 100%
rename from sapfor/experts/Sapfor_2017/SageOldSrc/CMakeLists.txt
rename to Sapfor/SageOldSrc/CMakeLists.txt
diff --git a/sapfor/experts/Sapfor_2017/Sapc++/Sapc++.sln b/Sapfor/Sapc++/Sapc++.sln
similarity index 100%
rename from sapfor/experts/Sapfor_2017/Sapc++/Sapc++.sln
rename to Sapfor/Sapc++/Sapc++.sln
diff --git a/sapfor/experts/Sapfor_2017/Sapfor/Makefile b/Sapfor/Sapfor/Makefile
similarity index 100%
rename from sapfor/experts/Sapfor_2017/Sapfor/Makefile
rename to Sapfor/Sapfor/Makefile
diff --git a/sapfor/experts/Sapfor_2017/_src/CFGraph/CFGraph.cpp b/Sapfor/_src/CFGraph/CFGraph.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/CFGraph/CFGraph.cpp
rename to Sapfor/_src/CFGraph/CFGraph.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/CFGraph/CFGraph.h b/Sapfor/_src/CFGraph/CFGraph.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/CFGraph/CFGraph.h
rename to Sapfor/_src/CFGraph/CFGraph.h
diff --git a/sapfor/experts/Sapfor_2017/_src/CFGraph/DataFlow/backward_data_flow.h b/Sapfor/_src/CFGraph/DataFlow/backward_data_flow.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/CFGraph/DataFlow/backward_data_flow.h
rename to Sapfor/_src/CFGraph/DataFlow/backward_data_flow.h
diff --git a/sapfor/experts/Sapfor_2017/_src/CFGraph/DataFlow/backward_data_flow_impl.h b/Sapfor/_src/CFGraph/DataFlow/backward_data_flow_impl.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/CFGraph/DataFlow/backward_data_flow_impl.h
rename to Sapfor/_src/CFGraph/DataFlow/backward_data_flow_impl.h
diff --git a/sapfor/experts/Sapfor_2017/_src/CFGraph/DataFlow/data_flow.h b/Sapfor/_src/CFGraph/DataFlow/data_flow.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/CFGraph/DataFlow/data_flow.h
rename to Sapfor/_src/CFGraph/DataFlow/data_flow.h
diff --git a/sapfor/experts/Sapfor_2017/_src/CFGraph/DataFlow/data_flow_impl.h b/Sapfor/_src/CFGraph/DataFlow/data_flow_impl.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/CFGraph/DataFlow/data_flow_impl.h
rename to Sapfor/_src/CFGraph/DataFlow/data_flow_impl.h
diff --git a/sapfor/experts/Sapfor_2017/_src/CFGraph/IR.cpp b/Sapfor/_src/CFGraph/IR.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/CFGraph/IR.cpp
rename to Sapfor/_src/CFGraph/IR.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/CFGraph/IR.h b/Sapfor/_src/CFGraph/IR.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/CFGraph/IR.h
rename to Sapfor/_src/CFGraph/IR.h
diff --git a/sapfor/experts/Sapfor_2017/_src/CFGraph/RD_subst.cpp b/Sapfor/_src/CFGraph/RD_subst.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/CFGraph/RD_subst.cpp
rename to Sapfor/_src/CFGraph/RD_subst.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/CFGraph/RD_subst.h b/Sapfor/_src/CFGraph/RD_subst.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/CFGraph/RD_subst.h
rename to Sapfor/_src/CFGraph/RD_subst.h
diff --git a/sapfor/experts/Sapfor_2017/_src/CFGraph/live_variable_analysis.cpp b/Sapfor/_src/CFGraph/live_variable_analysis.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/CFGraph/live_variable_analysis.cpp
rename to Sapfor/_src/CFGraph/live_variable_analysis.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/CFGraph/live_variable_analysis.h b/Sapfor/_src/CFGraph/live_variable_analysis.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/CFGraph/live_variable_analysis.h
rename to Sapfor/_src/CFGraph/live_variable_analysis.h
diff --git a/sapfor/experts/Sapfor_2017/_src/CFGraph/private_variables_analysis.cpp b/Sapfor/_src/CFGraph/private_variables_analysis.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/CFGraph/private_variables_analysis.cpp
rename to Sapfor/_src/CFGraph/private_variables_analysis.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/CFGraph/private_variables_analysis.h b/Sapfor/_src/CFGraph/private_variables_analysis.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/CFGraph/private_variables_analysis.h
rename to Sapfor/_src/CFGraph/private_variables_analysis.h
diff --git a/sapfor/experts/Sapfor_2017/_src/CreateInterTree/CreateInterTree.cpp b/Sapfor/_src/CreateInterTree/CreateInterTree.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/CreateInterTree/CreateInterTree.cpp
rename to Sapfor/_src/CreateInterTree/CreateInterTree.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/CreateInterTree/CreateInterTree.h b/Sapfor/_src/CreateInterTree/CreateInterTree.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/CreateInterTree/CreateInterTree.h
rename to Sapfor/_src/CreateInterTree/CreateInterTree.h
diff --git a/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/directive_analyzer.cpp b/Sapfor/_src/DirectiveProcessing/directive_analyzer.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/directive_analyzer.cpp
rename to Sapfor/_src/DirectiveProcessing/directive_analyzer.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/directive_analyzer.h b/Sapfor/_src/DirectiveProcessing/directive_analyzer.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/directive_analyzer.h
rename to Sapfor/_src/DirectiveProcessing/directive_analyzer.h
diff --git a/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/directive_creator.cpp b/Sapfor/_src/DirectiveProcessing/directive_creator.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/directive_creator.cpp
rename to Sapfor/_src/DirectiveProcessing/directive_creator.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/directive_creator.h b/Sapfor/_src/DirectiveProcessing/directive_creator.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/directive_creator.h
rename to Sapfor/_src/DirectiveProcessing/directive_creator.h
diff --git a/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/directive_creator_base.cpp b/Sapfor/_src/DirectiveProcessing/directive_creator_base.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/directive_creator_base.cpp
rename to Sapfor/_src/DirectiveProcessing/directive_creator_base.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/directive_omp_parser.cpp b/Sapfor/_src/DirectiveProcessing/directive_omp_parser.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/directive_omp_parser.cpp
rename to Sapfor/_src/DirectiveProcessing/directive_omp_parser.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/directive_omp_parser.h b/Sapfor/_src/DirectiveProcessing/directive_omp_parser.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/directive_omp_parser.h
rename to Sapfor/_src/DirectiveProcessing/directive_omp_parser.h
diff --git a/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/directive_parser.cpp b/Sapfor/_src/DirectiveProcessing/directive_parser.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/directive_parser.cpp
rename to Sapfor/_src/DirectiveProcessing/directive_parser.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/directive_parser.h b/Sapfor/_src/DirectiveProcessing/directive_parser.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/directive_parser.h
rename to Sapfor/_src/DirectiveProcessing/directive_parser.h
diff --git a/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/insert_directive.cpp b/Sapfor/_src/DirectiveProcessing/insert_directive.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/insert_directive.cpp
rename to Sapfor/_src/DirectiveProcessing/insert_directive.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/insert_directive.h b/Sapfor/_src/DirectiveProcessing/insert_directive.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/insert_directive.h
rename to Sapfor/_src/DirectiveProcessing/insert_directive.h
diff --git a/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/remote_access.cpp b/Sapfor/_src/DirectiveProcessing/remote_access.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/remote_access.cpp
rename to Sapfor/_src/DirectiveProcessing/remote_access.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/remote_access.h b/Sapfor/_src/DirectiveProcessing/remote_access.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/remote_access.h
rename to Sapfor/_src/DirectiveProcessing/remote_access.h
diff --git a/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/remote_access_base.cpp b/Sapfor/_src/DirectiveProcessing/remote_access_base.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/remote_access_base.cpp
rename to Sapfor/_src/DirectiveProcessing/remote_access_base.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/shadow.cpp b/Sapfor/_src/DirectiveProcessing/shadow.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/shadow.cpp
rename to Sapfor/_src/DirectiveProcessing/shadow.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/shadow.h b/Sapfor/_src/DirectiveProcessing/shadow.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/shadow.h
rename to Sapfor/_src/DirectiveProcessing/shadow.h
diff --git a/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/spf_directive_preproc.cpp b/Sapfor/_src/DirectiveProcessing/spf_directive_preproc.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/spf_directive_preproc.cpp
rename to Sapfor/_src/DirectiveProcessing/spf_directive_preproc.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Distribution/Array.cpp b/Sapfor/_src/Distribution/Array.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Distribution/Array.cpp
rename to Sapfor/_src/Distribution/Array.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Distribution/Array.h b/Sapfor/_src/Distribution/Array.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Distribution/Array.h
rename to Sapfor/_src/Distribution/Array.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Distribution/ArrayAnalysis.cpp b/Sapfor/_src/Distribution/ArrayAnalysis.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Distribution/ArrayAnalysis.cpp
rename to Sapfor/_src/Distribution/ArrayAnalysis.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Distribution/Arrays.h b/Sapfor/_src/Distribution/Arrays.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Distribution/Arrays.h
rename to Sapfor/_src/Distribution/Arrays.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Distribution/CreateDistributionDirs.cpp b/Sapfor/_src/Distribution/CreateDistributionDirs.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Distribution/CreateDistributionDirs.cpp
rename to Sapfor/_src/Distribution/CreateDistributionDirs.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Distribution/CreateDistributionDirs.h b/Sapfor/_src/Distribution/CreateDistributionDirs.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Distribution/CreateDistributionDirs.h
rename to Sapfor/_src/Distribution/CreateDistributionDirs.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Distribution/Cycle.cpp b/Sapfor/_src/Distribution/Cycle.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Distribution/Cycle.cpp
rename to Sapfor/_src/Distribution/Cycle.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Distribution/Cycle.h b/Sapfor/_src/Distribution/Cycle.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Distribution/Cycle.h
rename to Sapfor/_src/Distribution/Cycle.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Distribution/Distribution.cpp b/Sapfor/_src/Distribution/Distribution.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Distribution/Distribution.cpp
rename to Sapfor/_src/Distribution/Distribution.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Distribution/Distribution.h b/Sapfor/_src/Distribution/Distribution.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Distribution/Distribution.h
rename to Sapfor/_src/Distribution/Distribution.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Distribution/DvmhDirective.cpp b/Sapfor/_src/Distribution/DvmhDirective.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Distribution/DvmhDirective.cpp
rename to Sapfor/_src/Distribution/DvmhDirective.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Distribution/DvmhDirective.h b/Sapfor/_src/Distribution/DvmhDirective.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Distribution/DvmhDirective.h
rename to Sapfor/_src/Distribution/DvmhDirective.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Distribution/DvmhDirectiveBase.cpp b/Sapfor/_src/Distribution/DvmhDirectiveBase.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Distribution/DvmhDirectiveBase.cpp
rename to Sapfor/_src/Distribution/DvmhDirectiveBase.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Distribution/DvmhDirectiveBase.h b/Sapfor/_src/Distribution/DvmhDirectiveBase.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Distribution/DvmhDirectiveBase.h
rename to Sapfor/_src/Distribution/DvmhDirectiveBase.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Distribution/DvmhDirective_func.h b/Sapfor/_src/Distribution/DvmhDirective_func.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Distribution/DvmhDirective_func.h
rename to Sapfor/_src/Distribution/DvmhDirective_func.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Distribution/GraphCSR.cpp b/Sapfor/_src/Distribution/GraphCSR.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Distribution/GraphCSR.cpp
rename to Sapfor/_src/Distribution/GraphCSR.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Distribution/GraphCSR.h b/Sapfor/_src/Distribution/GraphCSR.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Distribution/GraphCSR.h
rename to Sapfor/_src/Distribution/GraphCSR.h
diff --git a/sapfor/experts/Sapfor_2017/_src/DvmhRegions/DvmhRegion.cpp b/Sapfor/_src/DvmhRegions/DvmhRegion.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DvmhRegions/DvmhRegion.cpp
rename to Sapfor/_src/DvmhRegions/DvmhRegion.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/DvmhRegions/DvmhRegion.h b/Sapfor/_src/DvmhRegions/DvmhRegion.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DvmhRegions/DvmhRegion.h
rename to Sapfor/_src/DvmhRegions/DvmhRegion.h
diff --git a/sapfor/experts/Sapfor_2017/_src/DvmhRegions/DvmhRegionInserter.cpp b/Sapfor/_src/DvmhRegions/DvmhRegionInserter.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DvmhRegions/DvmhRegionInserter.cpp
rename to Sapfor/_src/DvmhRegions/DvmhRegionInserter.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/DvmhRegions/DvmhRegionInserter.h b/Sapfor/_src/DvmhRegions/DvmhRegionInserter.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DvmhRegions/DvmhRegionInserter.h
rename to Sapfor/_src/DvmhRegions/DvmhRegionInserter.h
diff --git a/sapfor/experts/Sapfor_2017/_src/DvmhRegions/LoopChecker.cpp b/Sapfor/_src/DvmhRegions/LoopChecker.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DvmhRegions/LoopChecker.cpp
rename to Sapfor/_src/DvmhRegions/LoopChecker.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/DvmhRegions/LoopChecker.h b/Sapfor/_src/DvmhRegions/LoopChecker.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DvmhRegions/LoopChecker.h
rename to Sapfor/_src/DvmhRegions/LoopChecker.h
diff --git a/sapfor/experts/Sapfor_2017/_src/DvmhRegions/ReadWriteAnalyzer.cpp b/Sapfor/_src/DvmhRegions/ReadWriteAnalyzer.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DvmhRegions/ReadWriteAnalyzer.cpp
rename to Sapfor/_src/DvmhRegions/ReadWriteAnalyzer.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/DvmhRegions/ReadWriteAnalyzer.h b/Sapfor/_src/DvmhRegions/ReadWriteAnalyzer.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DvmhRegions/ReadWriteAnalyzer.h
rename to Sapfor/_src/DvmhRegions/ReadWriteAnalyzer.h
diff --git a/sapfor/experts/Sapfor_2017/_src/DvmhRegions/RegionsMerger.cpp b/Sapfor/_src/DvmhRegions/RegionsMerger.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DvmhRegions/RegionsMerger.cpp
rename to Sapfor/_src/DvmhRegions/RegionsMerger.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/DvmhRegions/RegionsMerger.h b/Sapfor/_src/DvmhRegions/RegionsMerger.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DvmhRegions/RegionsMerger.h
rename to Sapfor/_src/DvmhRegions/RegionsMerger.h
diff --git a/sapfor/experts/Sapfor_2017/_src/DvmhRegions/TypedSymbol.cpp b/Sapfor/_src/DvmhRegions/TypedSymbol.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DvmhRegions/TypedSymbol.cpp
rename to Sapfor/_src/DvmhRegions/TypedSymbol.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/DvmhRegions/TypedSymbol.h b/Sapfor/_src/DvmhRegions/TypedSymbol.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DvmhRegions/TypedSymbol.h
rename to Sapfor/_src/DvmhRegions/TypedSymbol.h
diff --git a/sapfor/experts/Sapfor_2017/_src/DvmhRegions/VarUsages.cpp b/Sapfor/_src/DvmhRegions/VarUsages.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DvmhRegions/VarUsages.cpp
rename to Sapfor/_src/DvmhRegions/VarUsages.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/DvmhRegions/VarUsages.h b/Sapfor/_src/DvmhRegions/VarUsages.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DvmhRegions/VarUsages.h
rename to Sapfor/_src/DvmhRegions/VarUsages.h
diff --git a/sapfor/experts/Sapfor_2017/_src/DynamicAnalysis/createParallelRegions.cpp b/Sapfor/_src/DynamicAnalysis/createParallelRegions.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DynamicAnalysis/createParallelRegions.cpp
rename to Sapfor/_src/DynamicAnalysis/createParallelRegions.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/DynamicAnalysis/createParallelRegions.h b/Sapfor/_src/DynamicAnalysis/createParallelRegions.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DynamicAnalysis/createParallelRegions.h
rename to Sapfor/_src/DynamicAnalysis/createParallelRegions.h
diff --git a/sapfor/experts/Sapfor_2017/_src/DynamicAnalysis/gCov_parser.cpp b/Sapfor/_src/DynamicAnalysis/gCov_parser.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DynamicAnalysis/gCov_parser.cpp
rename to Sapfor/_src/DynamicAnalysis/gCov_parser.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/DynamicAnalysis/gCov_parser_func.h b/Sapfor/_src/DynamicAnalysis/gCov_parser_func.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DynamicAnalysis/gCov_parser_func.h
rename to Sapfor/_src/DynamicAnalysis/gCov_parser_func.h
diff --git a/sapfor/experts/Sapfor_2017/_src/DynamicAnalysis/gcov_info.cpp b/Sapfor/_src/DynamicAnalysis/gcov_info.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DynamicAnalysis/gcov_info.cpp
rename to Sapfor/_src/DynamicAnalysis/gcov_info.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/DynamicAnalysis/gcov_info.h b/Sapfor/_src/DynamicAnalysis/gcov_info.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DynamicAnalysis/gcov_info.h
rename to Sapfor/_src/DynamicAnalysis/gcov_info.h
diff --git a/sapfor/experts/Sapfor_2017/_src/ExpressionTransform/control_flow_graph_part.cpp b/Sapfor/_src/ExpressionTransform/control_flow_graph_part.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/ExpressionTransform/control_flow_graph_part.cpp
rename to Sapfor/_src/ExpressionTransform/control_flow_graph_part.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/ExpressionTransform/expr_transform.cpp b/Sapfor/_src/ExpressionTransform/expr_transform.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/ExpressionTransform/expr_transform.cpp
rename to Sapfor/_src/ExpressionTransform/expr_transform.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/ExpressionTransform/expr_transform.h b/Sapfor/_src/ExpressionTransform/expr_transform.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/ExpressionTransform/expr_transform.h
rename to Sapfor/_src/ExpressionTransform/expr_transform.h
diff --git a/sapfor/experts/Sapfor_2017/_src/GraphCall/graph_calls.cpp b/Sapfor/_src/GraphCall/graph_calls.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/GraphCall/graph_calls.cpp
rename to Sapfor/_src/GraphCall/graph_calls.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/GraphCall/graph_calls.h b/Sapfor/_src/GraphCall/graph_calls.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/GraphCall/graph_calls.h
rename to Sapfor/_src/GraphCall/graph_calls.h
diff --git a/sapfor/experts/Sapfor_2017/_src/GraphCall/graph_calls_base.cpp b/Sapfor/_src/GraphCall/graph_calls_base.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/GraphCall/graph_calls_base.cpp
rename to Sapfor/_src/GraphCall/graph_calls_base.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/GraphCall/graph_calls_func.h b/Sapfor/_src/GraphCall/graph_calls_func.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/GraphCall/graph_calls_func.h
rename to Sapfor/_src/GraphCall/graph_calls_func.h
diff --git a/sapfor/experts/Sapfor_2017/_src/GraphLoop/graph_loops.cpp b/Sapfor/_src/GraphLoop/graph_loops.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/GraphLoop/graph_loops.cpp
rename to Sapfor/_src/GraphLoop/graph_loops.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/GraphLoop/graph_loops.h b/Sapfor/_src/GraphLoop/graph_loops.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/GraphLoop/graph_loops.h
rename to Sapfor/_src/GraphLoop/graph_loops.h
diff --git a/sapfor/experts/Sapfor_2017/_src/GraphLoop/graph_loops_base.cpp b/Sapfor/_src/GraphLoop/graph_loops_base.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/GraphLoop/graph_loops_base.cpp
rename to Sapfor/_src/GraphLoop/graph_loops_base.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/GraphLoop/graph_loops_func.h b/Sapfor/_src/GraphLoop/graph_loops_func.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/GraphLoop/graph_loops_func.h
rename to Sapfor/_src/GraphLoop/graph_loops_func.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Inliner/inliner.cpp b/Sapfor/_src/Inliner/inliner.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Inliner/inliner.cpp
rename to Sapfor/_src/Inliner/inliner.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Inliner/inliner.h b/Sapfor/_src/Inliner/inliner.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Inliner/inliner.h
rename to Sapfor/_src/Inliner/inliner.h
diff --git a/sapfor/experts/Sapfor_2017/_src/LoopAnalyzer/allocations_prepoc.cpp b/Sapfor/_src/LoopAnalyzer/allocations_prepoc.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/LoopAnalyzer/allocations_prepoc.cpp
rename to Sapfor/_src/LoopAnalyzer/allocations_prepoc.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/LoopAnalyzer/dep_analyzer.cpp b/Sapfor/_src/LoopAnalyzer/dep_analyzer.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/LoopAnalyzer/dep_analyzer.cpp
rename to Sapfor/_src/LoopAnalyzer/dep_analyzer.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/LoopAnalyzer/loop_analyzer.cpp b/Sapfor/_src/LoopAnalyzer/loop_analyzer.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/LoopAnalyzer/loop_analyzer.cpp
rename to Sapfor/_src/LoopAnalyzer/loop_analyzer.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/LoopAnalyzer/loop_analyzer.h b/Sapfor/_src/LoopAnalyzer/loop_analyzer.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/LoopAnalyzer/loop_analyzer.h
rename to Sapfor/_src/LoopAnalyzer/loop_analyzer.h
diff --git a/sapfor/experts/Sapfor_2017/_src/ParallelizationRegions/ParRegions.cpp b/Sapfor/_src/ParallelizationRegions/ParRegions.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/ParallelizationRegions/ParRegions.cpp
rename to Sapfor/_src/ParallelizationRegions/ParRegions.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/ParallelizationRegions/ParRegions.h b/Sapfor/_src/ParallelizationRegions/ParRegions.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/ParallelizationRegions/ParRegions.h
rename to Sapfor/_src/ParallelizationRegions/ParRegions.h
diff --git a/sapfor/experts/Sapfor_2017/_src/ParallelizationRegions/ParRegions_func.h b/Sapfor/_src/ParallelizationRegions/ParRegions_func.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/ParallelizationRegions/ParRegions_func.h
rename to Sapfor/_src/ParallelizationRegions/ParRegions_func.h
diff --git a/sapfor/experts/Sapfor_2017/_src/ParallelizationRegions/expand_extract_reg.cpp b/Sapfor/_src/ParallelizationRegions/expand_extract_reg.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/ParallelizationRegions/expand_extract_reg.cpp
rename to Sapfor/_src/ParallelizationRegions/expand_extract_reg.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/ParallelizationRegions/expand_extract_reg.h b/Sapfor/_src/ParallelizationRegions/expand_extract_reg.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/ParallelizationRegions/expand_extract_reg.h
rename to Sapfor/_src/ParallelizationRegions/expand_extract_reg.h
diff --git a/sapfor/experts/Sapfor_2017/_src/ParallelizationRegions/resolve_par_reg_conflicts.cpp b/Sapfor/_src/ParallelizationRegions/resolve_par_reg_conflicts.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/ParallelizationRegions/resolve_par_reg_conflicts.cpp
rename to Sapfor/_src/ParallelizationRegions/resolve_par_reg_conflicts.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/ParallelizationRegions/resolve_par_reg_conflicts.h b/Sapfor/_src/ParallelizationRegions/resolve_par_reg_conflicts.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/ParallelizationRegions/resolve_par_reg_conflicts.h
rename to Sapfor/_src/ParallelizationRegions/resolve_par_reg_conflicts.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/AMView.cpp b/Sapfor/_src/Predictor/Lib/AMView.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/AMView.cpp
rename to Sapfor/_src/Predictor/Lib/AMView.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/AMView.h b/Sapfor/_src/Predictor/Lib/AMView.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/AMView.h
rename to Sapfor/_src/Predictor/Lib/AMView.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/AlignAxis.cpp b/Sapfor/_src/Predictor/Lib/AlignAxis.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/AlignAxis.cpp
rename to Sapfor/_src/Predictor/Lib/AlignAxis.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/AlignAxis.h b/Sapfor/_src/Predictor/Lib/AlignAxis.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/AlignAxis.h
rename to Sapfor/_src/Predictor/Lib/AlignAxis.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/BGroup.cpp b/Sapfor/_src/Predictor/Lib/BGroup.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/BGroup.cpp
rename to Sapfor/_src/Predictor/Lib/BGroup.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/BGroup.h b/Sapfor/_src/Predictor/Lib/BGroup.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/BGroup.h
rename to Sapfor/_src/Predictor/Lib/BGroup.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Block.cpp b/Sapfor/_src/Predictor/Lib/Block.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Block.cpp
rename to Sapfor/_src/Predictor/Lib/Block.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Block.h b/Sapfor/_src/Predictor/Lib/Block.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Block.h
rename to Sapfor/_src/Predictor/Lib/Block.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/CallInfoStructs.h b/Sapfor/_src/Predictor/Lib/CallInfoStructs.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/CallInfoStructs.h
rename to Sapfor/_src/Predictor/Lib/CallInfoStructs.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/CallParams.cpp b/Sapfor/_src/Predictor/Lib/CallParams.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/CallParams.cpp
rename to Sapfor/_src/Predictor/Lib/CallParams.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/CommCost.cpp b/Sapfor/_src/Predictor/Lib/CommCost.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/CommCost.cpp
rename to Sapfor/_src/Predictor/Lib/CommCost.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/CommCost.h b/Sapfor/_src/Predictor/Lib/CommCost.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/CommCost.h
rename to Sapfor/_src/Predictor/Lib/CommCost.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/DArray.cpp b/Sapfor/_src/Predictor/Lib/DArray.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/DArray.cpp
rename to Sapfor/_src/Predictor/Lib/DArray.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/DArray.h b/Sapfor/_src/Predictor/Lib/DArray.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/DArray.h
rename to Sapfor/_src/Predictor/Lib/DArray.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/DimBound.cpp b/Sapfor/_src/Predictor/Lib/DimBound.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/DimBound.cpp
rename to Sapfor/_src/Predictor/Lib/DimBound.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/DimBound.h b/Sapfor/_src/Predictor/Lib/DimBound.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/DimBound.h
rename to Sapfor/_src/Predictor/Lib/DimBound.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/DistAxis.cpp b/Sapfor/_src/Predictor/Lib/DistAxis.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/DistAxis.cpp
rename to Sapfor/_src/Predictor/Lib/DistAxis.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/DistAxis.h b/Sapfor/_src/Predictor/Lib/DistAxis.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/DistAxis.h
rename to Sapfor/_src/Predictor/Lib/DistAxis.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Event.cpp b/Sapfor/_src/Predictor/Lib/Event.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Event.cpp
rename to Sapfor/_src/Predictor/Lib/Event.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Event.h b/Sapfor/_src/Predictor/Lib/Event.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Event.h
rename to Sapfor/_src/Predictor/Lib/Event.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/FuncCall.cpp b/Sapfor/_src/Predictor/Lib/FuncCall.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/FuncCall.cpp
rename to Sapfor/_src/Predictor/Lib/FuncCall.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/FuncCall.h b/Sapfor/_src/Predictor/Lib/FuncCall.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/FuncCall.h
rename to Sapfor/_src/Predictor/Lib/FuncCall.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Interval.cpp b/Sapfor/_src/Predictor/Lib/Interval.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Interval.cpp
rename to Sapfor/_src/Predictor/Lib/Interval.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Interval.h b/Sapfor/_src/Predictor/Lib/Interval.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Interval.h
rename to Sapfor/_src/Predictor/Lib/Interval.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/IntervalTemplate.cpp b/Sapfor/_src/Predictor/Lib/IntervalTemplate.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/IntervalTemplate.cpp
rename to Sapfor/_src/Predictor/Lib/IntervalTemplate.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/LoopBlock.cpp b/Sapfor/_src/Predictor/Lib/LoopBlock.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/LoopBlock.cpp
rename to Sapfor/_src/Predictor/Lib/LoopBlock.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/LoopBlock.h b/Sapfor/_src/Predictor/Lib/LoopBlock.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/LoopBlock.h
rename to Sapfor/_src/Predictor/Lib/LoopBlock.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/LoopLS.cpp b/Sapfor/_src/Predictor/Lib/LoopLS.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/LoopLS.cpp
rename to Sapfor/_src/Predictor/Lib/LoopLS.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/LoopLS.h b/Sapfor/_src/Predictor/Lib/LoopLS.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/LoopLS.h
rename to Sapfor/_src/Predictor/Lib/LoopLS.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Ls.cpp b/Sapfor/_src/Predictor/Lib/Ls.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Ls.cpp
rename to Sapfor/_src/Predictor/Lib/Ls.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Ls.h b/Sapfor/_src/Predictor/Lib/Ls.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Ls.h
rename to Sapfor/_src/Predictor/Lib/Ls.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/ModelDArray.cpp b/Sapfor/_src/Predictor/Lib/ModelDArray.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/ModelDArray.cpp
rename to Sapfor/_src/Predictor/Lib/ModelDArray.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/ModelIO.cpp b/Sapfor/_src/Predictor/Lib/ModelIO.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/ModelIO.cpp
rename to Sapfor/_src/Predictor/Lib/ModelIO.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/ModelInterval.cpp b/Sapfor/_src/Predictor/Lib/ModelInterval.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/ModelInterval.cpp
rename to Sapfor/_src/Predictor/Lib/ModelInterval.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/ModelMPS_AM.cpp b/Sapfor/_src/Predictor/Lib/ModelMPS_AM.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/ModelMPS_AM.cpp
rename to Sapfor/_src/Predictor/Lib/ModelMPS_AM.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/ModelParLoop.cpp b/Sapfor/_src/Predictor/Lib/ModelParLoop.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/ModelParLoop.cpp
rename to Sapfor/_src/Predictor/Lib/ModelParLoop.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/ModelReduct.cpp b/Sapfor/_src/Predictor/Lib/ModelReduct.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/ModelReduct.cpp
rename to Sapfor/_src/Predictor/Lib/ModelReduct.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/ModelRegular.cpp b/Sapfor/_src/Predictor/Lib/ModelRegular.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/ModelRegular.cpp
rename to Sapfor/_src/Predictor/Lib/ModelRegular.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/ModelRemAccess.cpp b/Sapfor/_src/Predictor/Lib/ModelRemAccess.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/ModelRemAccess.cpp
rename to Sapfor/_src/Predictor/Lib/ModelRemAccess.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/ModelShadow.cpp b/Sapfor/_src/Predictor/Lib/ModelShadow.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/ModelShadow.cpp
rename to Sapfor/_src/Predictor/Lib/ModelShadow.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/ModelStructs.h b/Sapfor/_src/Predictor/Lib/ModelStructs.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/ModelStructs.h
rename to Sapfor/_src/Predictor/Lib/ModelStructs.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/ParLoop.cpp b/Sapfor/_src/Predictor/Lib/ParLoop.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/ParLoop.cpp
rename to Sapfor/_src/Predictor/Lib/ParLoop.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/ParLoop.h b/Sapfor/_src/Predictor/Lib/ParLoop.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/ParLoop.h
rename to Sapfor/_src/Predictor/Lib/ParLoop.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/ParseString.cpp b/Sapfor/_src/Predictor/Lib/ParseString.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/ParseString.cpp
rename to Sapfor/_src/Predictor/Lib/ParseString.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/ParseString.h b/Sapfor/_src/Predictor/Lib/ParseString.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/ParseString.h
rename to Sapfor/_src/Predictor/Lib/ParseString.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Processor.cpp b/Sapfor/_src/Predictor/Lib/Processor.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Processor.cpp
rename to Sapfor/_src/Predictor/Lib/Processor.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Processor.h b/Sapfor/_src/Predictor/Lib/Processor.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Processor.h
rename to Sapfor/_src/Predictor/Lib/Processor.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Ps.cpp b/Sapfor/_src/Predictor/Lib/Ps.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Ps.cpp
rename to Sapfor/_src/Predictor/Lib/Ps.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Ps.h b/Sapfor/_src/Predictor/Lib/Ps.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Ps.h
rename to Sapfor/_src/Predictor/Lib/Ps.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/RedGroup.cpp b/Sapfor/_src/Predictor/Lib/RedGroup.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/RedGroup.cpp
rename to Sapfor/_src/Predictor/Lib/RedGroup.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/RedGroup.h b/Sapfor/_src/Predictor/Lib/RedGroup.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/RedGroup.h
rename to Sapfor/_src/Predictor/Lib/RedGroup.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/RedVar.cpp b/Sapfor/_src/Predictor/Lib/RedVar.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/RedVar.cpp
rename to Sapfor/_src/Predictor/Lib/RedVar.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/RedVar.h b/Sapfor/_src/Predictor/Lib/RedVar.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/RedVar.h
rename to Sapfor/_src/Predictor/Lib/RedVar.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/RemAccessBuf.cpp b/Sapfor/_src/Predictor/Lib/RemAccessBuf.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/RemAccessBuf.cpp
rename to Sapfor/_src/Predictor/Lib/RemAccessBuf.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/RemAccessBuf.h b/Sapfor/_src/Predictor/Lib/RemAccessBuf.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/RemAccessBuf.h
rename to Sapfor/_src/Predictor/Lib/RemAccessBuf.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Space.cpp b/Sapfor/_src/Predictor/Lib/Space.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Space.cpp
rename to Sapfor/_src/Predictor/Lib/Space.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Space.h b/Sapfor/_src/Predictor/Lib/Space.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Space.h
rename to Sapfor/_src/Predictor/Lib/Space.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/StdAfx.h b/Sapfor/_src/Predictor/Lib/StdAfx.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/StdAfx.h
rename to Sapfor/_src/Predictor/Lib/StdAfx.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/TraceLine.cpp b/Sapfor/_src/Predictor/Lib/TraceLine.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/TraceLine.cpp
rename to Sapfor/_src/Predictor/Lib/TraceLine.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/TraceLine.h b/Sapfor/_src/Predictor/Lib/TraceLine.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/TraceLine.h
rename to Sapfor/_src/Predictor/Lib/TraceLine.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Ver.h b/Sapfor/_src/Predictor/Lib/Ver.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Ver.h
rename to Sapfor/_src/Predictor/Lib/Ver.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Vm.cpp b/Sapfor/_src/Predictor/Lib/Vm.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Vm.cpp
rename to Sapfor/_src/Predictor/Lib/Vm.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Vm.h b/Sapfor/_src/Predictor/Lib/Vm.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Vm.h
rename to Sapfor/_src/Predictor/Lib/Vm.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/adler32.c b/Sapfor/_src/Predictor/Lib/adler32.c
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/adler32.c
rename to Sapfor/_src/Predictor/Lib/adler32.c
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/compress.c b/Sapfor/_src/Predictor/Lib/compress.c
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/compress.c
rename to Sapfor/_src/Predictor/Lib/compress.c
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/crc32.c b/Sapfor/_src/Predictor/Lib/crc32.c
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/crc32.c
rename to Sapfor/_src/Predictor/Lib/crc32.c
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/deflate.c b/Sapfor/_src/Predictor/Lib/deflate.c
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/deflate.c
rename to Sapfor/_src/Predictor/Lib/deflate.c
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/deflate.h b/Sapfor/_src/Predictor/Lib/deflate.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/deflate.h
rename to Sapfor/_src/Predictor/Lib/deflate.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/gzio.c b/Sapfor/_src/Predictor/Lib/gzio.c
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/gzio.c
rename to Sapfor/_src/Predictor/Lib/gzio.c
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/infblock.c b/Sapfor/_src/Predictor/Lib/infblock.c
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/infblock.c
rename to Sapfor/_src/Predictor/Lib/infblock.c
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/infblock.h b/Sapfor/_src/Predictor/Lib/infblock.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/infblock.h
rename to Sapfor/_src/Predictor/Lib/infblock.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/infcodes.c b/Sapfor/_src/Predictor/Lib/infcodes.c
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/infcodes.c
rename to Sapfor/_src/Predictor/Lib/infcodes.c
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/infcodes.h b/Sapfor/_src/Predictor/Lib/infcodes.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/infcodes.h
rename to Sapfor/_src/Predictor/Lib/infcodes.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/inffast.c b/Sapfor/_src/Predictor/Lib/inffast.c
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/inffast.c
rename to Sapfor/_src/Predictor/Lib/inffast.c
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/inffast.h b/Sapfor/_src/Predictor/Lib/inffast.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/inffast.h
rename to Sapfor/_src/Predictor/Lib/inffast.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/inffixed.h b/Sapfor/_src/Predictor/Lib/inffixed.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/inffixed.h
rename to Sapfor/_src/Predictor/Lib/inffixed.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/inflate.c b/Sapfor/_src/Predictor/Lib/inflate.c
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/inflate.c
rename to Sapfor/_src/Predictor/Lib/inflate.c
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/inftrees.c b/Sapfor/_src/Predictor/Lib/inftrees.c
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/inftrees.c
rename to Sapfor/_src/Predictor/Lib/inftrees.c
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/inftrees.h b/Sapfor/_src/Predictor/Lib/inftrees.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/inftrees.h
rename to Sapfor/_src/Predictor/Lib/inftrees.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/infutil.c b/Sapfor/_src/Predictor/Lib/infutil.c
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/infutil.c
rename to Sapfor/_src/Predictor/Lib/infutil.c
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/infutil.h b/Sapfor/_src/Predictor/Lib/infutil.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/infutil.h
rename to Sapfor/_src/Predictor/Lib/infutil.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/intersection.cpp b/Sapfor/_src/Predictor/Lib/intersection.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/intersection.cpp
rename to Sapfor/_src/Predictor/Lib/intersection.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/predictor.cpp b/Sapfor/_src/Predictor/Lib/predictor.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/predictor.cpp
rename to Sapfor/_src/Predictor/Lib/predictor.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/trees.c b/Sapfor/_src/Predictor/Lib/trees.c
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/trees.c
rename to Sapfor/_src/Predictor/Lib/trees.c
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/trees.h b/Sapfor/_src/Predictor/Lib/trees.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/trees.h
rename to Sapfor/_src/Predictor/Lib/trees.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/uncompr.c b/Sapfor/_src/Predictor/Lib/uncompr.c
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/uncompr.c
rename to Sapfor/_src/Predictor/Lib/uncompr.c
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/zconf.h b/Sapfor/_src/Predictor/Lib/zconf.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/zconf.h
rename to Sapfor/_src/Predictor/Lib/zconf.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/zlib.h b/Sapfor/_src/Predictor/Lib/zlib.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/zlib.h
rename to Sapfor/_src/Predictor/Lib/zlib.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/zutil.c b/Sapfor/_src/Predictor/Lib/zutil.c
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/zutil.c
rename to Sapfor/_src/Predictor/Lib/zutil.c
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/zutil.h b/Sapfor/_src/Predictor/Lib/zutil.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/zutil.h
rename to Sapfor/_src/Predictor/Lib/zutil.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/PredictScheme.cpp b/Sapfor/_src/Predictor/PredictScheme.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/PredictScheme.cpp
rename to Sapfor/_src/Predictor/PredictScheme.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/PredictScheme.h b/Sapfor/_src/Predictor/PredictScheme.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/PredictScheme.h
rename to Sapfor/_src/Predictor/PredictScheme.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/PredictorInterface.h b/Sapfor/_src/Predictor/PredictorInterface.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/PredictorInterface.h
rename to Sapfor/_src/Predictor/PredictorInterface.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/PredictorModel.cpp b/Sapfor/_src/Predictor/PredictorModel.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/PredictorModel.cpp
rename to Sapfor/_src/Predictor/PredictorModel.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/PredictorModel.h b/Sapfor/_src/Predictor/PredictorModel.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/PredictorModel.h
rename to Sapfor/_src/Predictor/PredictorModel.h
diff --git a/sapfor/experts/Sapfor_2017/_src/PrivateAnalyzer/private_analyzer.cpp b/Sapfor/_src/PrivateAnalyzer/private_analyzer.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/PrivateAnalyzer/private_analyzer.cpp
rename to Sapfor/_src/PrivateAnalyzer/private_analyzer.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/PrivateAnalyzer/private_analyzer.h b/Sapfor/_src/PrivateAnalyzer/private_analyzer.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/PrivateAnalyzer/private_analyzer.h
rename to Sapfor/_src/PrivateAnalyzer/private_analyzer.h
diff --git a/sapfor/experts/Sapfor_2017/_src/ProjectManipulation/ConvertFiles.cpp b/Sapfor/_src/ProjectManipulation/ConvertFiles.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/ProjectManipulation/ConvertFiles.cpp
rename to Sapfor/_src/ProjectManipulation/ConvertFiles.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/ProjectManipulation/ConvertFiles.h b/Sapfor/_src/ProjectManipulation/ConvertFiles.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/ProjectManipulation/ConvertFiles.h
rename to Sapfor/_src/ProjectManipulation/ConvertFiles.h
diff --git a/sapfor/experts/Sapfor_2017/_src/ProjectManipulation/FileInfo.cpp b/Sapfor/_src/ProjectManipulation/FileInfo.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/ProjectManipulation/FileInfo.cpp
rename to Sapfor/_src/ProjectManipulation/FileInfo.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/ProjectManipulation/FileInfo.h b/Sapfor/_src/ProjectManipulation/FileInfo.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/ProjectManipulation/FileInfo.h
rename to Sapfor/_src/ProjectManipulation/FileInfo.h
diff --git a/sapfor/experts/Sapfor_2017/_src/ProjectManipulation/ParseFiles.cpp b/Sapfor/_src/ProjectManipulation/ParseFiles.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/ProjectManipulation/ParseFiles.cpp
rename to Sapfor/_src/ProjectManipulation/ParseFiles.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/ProjectManipulation/ParseFiles.h b/Sapfor/_src/ProjectManipulation/ParseFiles.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/ProjectManipulation/ParseFiles.h
rename to Sapfor/_src/ProjectManipulation/ParseFiles.h
diff --git a/sapfor/experts/Sapfor_2017/_src/ProjectManipulation/PerfAnalyzer.cpp b/Sapfor/_src/ProjectManipulation/PerfAnalyzer.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/ProjectManipulation/PerfAnalyzer.cpp
rename to Sapfor/_src/ProjectManipulation/PerfAnalyzer.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/ProjectManipulation/PerfAnalyzer.h b/Sapfor/_src/ProjectManipulation/PerfAnalyzer.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/ProjectManipulation/PerfAnalyzer.h
rename to Sapfor/_src/ProjectManipulation/PerfAnalyzer.h
diff --git a/sapfor/experts/Sapfor_2017/_src/ProjectManipulation/StdCapture.h b/Sapfor/_src/ProjectManipulation/StdCapture.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/ProjectManipulation/StdCapture.h
rename to Sapfor/_src/ProjectManipulation/StdCapture.h
diff --git a/sapfor/experts/Sapfor_2017/_src/ProjectParameters/projectParameters.cpp b/Sapfor/_src/ProjectParameters/projectParameters.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/ProjectParameters/projectParameters.cpp
rename to Sapfor/_src/ProjectParameters/projectParameters.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/ProjectParameters/projectParameters.h b/Sapfor/_src/ProjectParameters/projectParameters.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/ProjectParameters/projectParameters.h
rename to Sapfor/_src/ProjectParameters/projectParameters.h
diff --git a/sapfor/experts/Sapfor_2017/_src/RenameSymbols/rename_symbols.cpp b/Sapfor/_src/RenameSymbols/rename_symbols.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/RenameSymbols/rename_symbols.cpp
rename to Sapfor/_src/RenameSymbols/rename_symbols.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/RenameSymbols/rename_symbols.h b/Sapfor/_src/RenameSymbols/rename_symbols.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/RenameSymbols/rename_symbols.h
rename to Sapfor/_src/RenameSymbols/rename_symbols.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/Makefile b/Sapfor/_src/SageAnalysisTool/Makefile
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/Makefile
rename to Sapfor/_src/SageAnalysisTool/Makefile
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/Makefile b/Sapfor/_src/SageAnalysisTool/OmegaForSage/Makefile
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/Makefile
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/Makefile
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/README b/Sapfor/_src/SageAnalysisTool/OmegaForSage/README
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/README
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/README
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/add-assert.cpp b/Sapfor/_src/SageAnalysisTool/OmegaForSage/add-assert.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/add-assert.cpp
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/add-assert.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/affine.cpp b/Sapfor/_src/SageAnalysisTool/OmegaForSage/affine.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/affine.cpp
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/affine.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/cover.cpp b/Sapfor/_src/SageAnalysisTool/OmegaForSage/cover.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/cover.cpp
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/cover.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/ddomega-build.cpp b/Sapfor/_src/SageAnalysisTool/OmegaForSage/ddomega-build.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/ddomega-build.cpp
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/ddomega-build.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/ddomega-use.cpp b/Sapfor/_src/SageAnalysisTool/OmegaForSage/ddomega-use.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/ddomega-use.cpp
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/ddomega-use.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/ddomega.cpp b/Sapfor/_src/SageAnalysisTool/OmegaForSage/ddomega.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/ddomega.cpp
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/ddomega.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/debug.cpp b/Sapfor/_src/SageAnalysisTool/OmegaForSage/debug.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/debug.cpp
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/debug.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/Exit.h b/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/Exit.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/Exit.h
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/include/Exit.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/add-assert.h b/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/add-assert.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/add-assert.h
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/include/add-assert.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/affine.h b/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/affine.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/affine.h
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/include/affine.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/cover.h b/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/cover.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/cover.h
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/include/cover.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/dddir.h b/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/dddir.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/dddir.h
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/include/dddir.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/ddomega-build.h b/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/ddomega-build.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/ddomega-build.h
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/include/ddomega-build.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/ddomega-use.h b/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/ddomega-use.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/ddomega-use.h
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/include/ddomega-use.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/ddomega.h b/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/ddomega.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/ddomega.h
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/include/ddomega.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/debug.h b/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/debug.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/debug.h
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/include/debug.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/flags.h b/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/flags.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/flags.h
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/include/flags.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/ip.h b/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/ip.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/ip.h
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/include/ip.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/kill.h b/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/kill.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/kill.h
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/include/kill.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/lang-interf.generic b/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/lang-interf.generic
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/lang-interf.generic
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/include/lang-interf.generic
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/lang-interf.h b/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/lang-interf.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/lang-interf.h
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/include/lang-interf.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/missing.h b/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/missing.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/missing.h
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/include/missing.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/omega2flags.h b/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/omega2flags.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/omega2flags.h
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/include/omega2flags.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/portable.h b/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/portable.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/portable.h
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/include/portable.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/portable.h.origine b/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/portable.h.origine
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/portable.h.origine
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/include/portable.h.origine
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/range.h b/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/range.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/range.h
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/include/range.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/refine.h b/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/refine.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/refine.h
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/include/refine.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/screen.h b/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/screen.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/screen.h
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/include/screen.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/timeTrials.h b/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/timeTrials.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/timeTrials.h
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/include/timeTrials.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/ip.cpp b/Sapfor/_src/SageAnalysisTool/OmegaForSage/ip.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/ip.cpp
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/ip.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/kill.cpp b/Sapfor/_src/SageAnalysisTool/OmegaForSage/kill.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/kill.cpp
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/kill.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/refine.cpp b/Sapfor/_src/SageAnalysisTool/OmegaForSage/refine.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/refine.cpp
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/refine.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/sagedriver.cpp b/Sapfor/_src/SageAnalysisTool/OmegaForSage/sagedriver.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/sagedriver.cpp
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/sagedriver.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/README b/Sapfor/_src/SageAnalysisTool/README
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/README
rename to Sapfor/_src/SageAnalysisTool/README
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/annotationDriver.cpp b/Sapfor/_src/SageAnalysisTool/annotationDriver.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/annotationDriver.cpp
rename to Sapfor/_src/SageAnalysisTool/annotationDriver.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/annotationDriver.h b/Sapfor/_src/SageAnalysisTool/annotationDriver.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/annotationDriver.h
rename to Sapfor/_src/SageAnalysisTool/annotationDriver.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/arrayRef.cpp b/Sapfor/_src/SageAnalysisTool/arrayRef.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/arrayRef.cpp
rename to Sapfor/_src/SageAnalysisTool/arrayRef.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/arrayRef.h b/Sapfor/_src/SageAnalysisTool/arrayRef.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/arrayRef.h
rename to Sapfor/_src/SageAnalysisTool/arrayRef.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/computeInducVar.cpp b/Sapfor/_src/SageAnalysisTool/computeInducVar.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/computeInducVar.cpp
rename to Sapfor/_src/SageAnalysisTool/computeInducVar.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/constanteProp.cpp b/Sapfor/_src/SageAnalysisTool/constanteProp.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/constanteProp.cpp
rename to Sapfor/_src/SageAnalysisTool/constanteProp.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/constanteSet.h b/Sapfor/_src/SageAnalysisTool/constanteSet.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/constanteSet.h
rename to Sapfor/_src/SageAnalysisTool/constanteSet.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/controlFlow.cpp b/Sapfor/_src/SageAnalysisTool/controlFlow.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/controlFlow.cpp
rename to Sapfor/_src/SageAnalysisTool/controlFlow.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/defUse.cpp b/Sapfor/_src/SageAnalysisTool/defUse.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/defUse.cpp
rename to Sapfor/_src/SageAnalysisTool/defUse.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/definesValues.h b/Sapfor/_src/SageAnalysisTool/definesValues.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/definesValues.h
rename to Sapfor/_src/SageAnalysisTool/definesValues.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/definitionSet.h b/Sapfor/_src/SageAnalysisTool/definitionSet.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/definitionSet.h
rename to Sapfor/_src/SageAnalysisTool/definitionSet.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/depGraph.cpp b/Sapfor/_src/SageAnalysisTool/depGraph.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/depGraph.cpp
rename to Sapfor/_src/SageAnalysisTool/depGraph.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/depGraph.h b/Sapfor/_src/SageAnalysisTool/depGraph.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/depGraph.h
rename to Sapfor/_src/SageAnalysisTool/depGraph.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/depInterface.cpp b/Sapfor/_src/SageAnalysisTool/depInterface.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/depInterface.cpp
rename to Sapfor/_src/SageAnalysisTool/depInterface.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/depInterface.h b/Sapfor/_src/SageAnalysisTool/depInterface.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/depInterface.h
rename to Sapfor/_src/SageAnalysisTool/depInterface.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/depInterfaceExt.h b/Sapfor/_src/SageAnalysisTool/depInterfaceExt.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/depInterfaceExt.h
rename to Sapfor/_src/SageAnalysisTool/depInterfaceExt.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/dependence.cpp b/Sapfor/_src/SageAnalysisTool/dependence.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/dependence.cpp
rename to Sapfor/_src/SageAnalysisTool/dependence.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/dependence.h b/Sapfor/_src/SageAnalysisTool/dependence.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/dependence.h
rename to Sapfor/_src/SageAnalysisTool/dependence.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/flowAnalysis.cpp b/Sapfor/_src/SageAnalysisTool/flowAnalysis.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/flowAnalysis.cpp
rename to Sapfor/_src/SageAnalysisTool/flowAnalysis.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/inducVar.h b/Sapfor/_src/SageAnalysisTool/inducVar.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/inducVar.h
rename to Sapfor/_src/SageAnalysisTool/inducVar.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/intrinsic.cpp b/Sapfor/_src/SageAnalysisTool/intrinsic.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/intrinsic.cpp
rename to Sapfor/_src/SageAnalysisTool/intrinsic.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/intrinsic.h b/Sapfor/_src/SageAnalysisTool/intrinsic.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/intrinsic.h
rename to Sapfor/_src/SageAnalysisTool/intrinsic.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/invariant.cpp b/Sapfor/_src/SageAnalysisTool/invariant.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/invariant.cpp
rename to Sapfor/_src/SageAnalysisTool/invariant.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/loopTransform.cpp b/Sapfor/_src/SageAnalysisTool/loopTransform.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/loopTransform.cpp
rename to Sapfor/_src/SageAnalysisTool/loopTransform.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/reductionCode.h b/Sapfor/_src/SageAnalysisTool/reductionCode.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/reductionCode.h
rename to Sapfor/_src/SageAnalysisTool/reductionCode.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/set.cpp b/Sapfor/_src/SageAnalysisTool/set.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/set.cpp
rename to Sapfor/_src/SageAnalysisTool/set.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/set.h b/Sapfor/_src/SageAnalysisTool/set.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/set.h
rename to Sapfor/_src/SageAnalysisTool/set.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Sapfor.cpp b/Sapfor/_src/Sapfor.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Sapfor.cpp
rename to Sapfor/_src/Sapfor.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Sapfor.h b/Sapfor/_src/Sapfor.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Sapfor.h
rename to Sapfor/_src/Sapfor.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SapforData.h b/Sapfor/_src/SapforData.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SapforData.h
rename to Sapfor/_src/SapforData.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Server/checkUniq.cpp b/Sapfor/_src/Server/checkUniq.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Server/checkUniq.cpp
rename to Sapfor/_src/Server/checkUniq.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Server/server.cpp b/Sapfor/_src/Server/server.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Server/server.cpp
rename to Sapfor/_src/Server/server.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Server/spf_icon.ico b/Sapfor/_src/Server/spf_icon.ico
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Server/spf_icon.ico
rename to Sapfor/_src/Server/spf_icon.ico
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/array_assign_to_loop.cpp b/Sapfor/_src/Transformations/array_assign_to_loop.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/array_assign_to_loop.cpp
rename to Sapfor/_src/Transformations/array_assign_to_loop.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/array_assign_to_loop.h b/Sapfor/_src/Transformations/array_assign_to_loop.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/array_assign_to_loop.h
rename to Sapfor/_src/Transformations/array_assign_to_loop.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/checkpoints.cpp b/Sapfor/_src/Transformations/checkpoints.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/checkpoints.cpp
rename to Sapfor/_src/Transformations/checkpoints.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/checkpoints.h b/Sapfor/_src/Transformations/checkpoints.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/checkpoints.h
rename to Sapfor/_src/Transformations/checkpoints.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/convert_to_c.cpp b/Sapfor/_src/Transformations/convert_to_c.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/convert_to_c.cpp
rename to Sapfor/_src/Transformations/convert_to_c.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/convert_to_c.h b/Sapfor/_src/Transformations/convert_to_c.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/convert_to_c.h
rename to Sapfor/_src/Transformations/convert_to_c.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/dead_code.cpp b/Sapfor/_src/Transformations/dead_code.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/dead_code.cpp
rename to Sapfor/_src/Transformations/dead_code.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/dead_code.h b/Sapfor/_src/Transformations/dead_code.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/dead_code.h
rename to Sapfor/_src/Transformations/dead_code.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/enddo_loop_converter.cpp b/Sapfor/_src/Transformations/enddo_loop_converter.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/enddo_loop_converter.cpp
rename to Sapfor/_src/Transformations/enddo_loop_converter.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/enddo_loop_converter.h b/Sapfor/_src/Transformations/enddo_loop_converter.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/enddo_loop_converter.h
rename to Sapfor/_src/Transformations/enddo_loop_converter.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/fix_common_blocks.cpp b/Sapfor/_src/Transformations/fix_common_blocks.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/fix_common_blocks.cpp
rename to Sapfor/_src/Transformations/fix_common_blocks.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/fix_common_blocks.h b/Sapfor/_src/Transformations/fix_common_blocks.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/fix_common_blocks.h
rename to Sapfor/_src/Transformations/fix_common_blocks.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/function_purifying.cpp b/Sapfor/_src/Transformations/function_purifying.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/function_purifying.cpp
rename to Sapfor/_src/Transformations/function_purifying.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/function_purifying.h b/Sapfor/_src/Transformations/function_purifying.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/function_purifying.h
rename to Sapfor/_src/Transformations/function_purifying.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/loop_transform.cpp b/Sapfor/_src/Transformations/loop_transform.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/loop_transform.cpp
rename to Sapfor/_src/Transformations/loop_transform.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/loop_transform.h b/Sapfor/_src/Transformations/loop_transform.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/loop_transform.h
rename to Sapfor/_src/Transformations/loop_transform.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/loops_combiner.cpp b/Sapfor/_src/Transformations/loops_combiner.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/loops_combiner.cpp
rename to Sapfor/_src/Transformations/loops_combiner.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/loops_combiner.h b/Sapfor/_src/Transformations/loops_combiner.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/loops_combiner.h
rename to Sapfor/_src/Transformations/loops_combiner.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/loops_splitter.cpp b/Sapfor/_src/Transformations/loops_splitter.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/loops_splitter.cpp
rename to Sapfor/_src/Transformations/loops_splitter.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/loops_splitter.h b/Sapfor/_src/Transformations/loops_splitter.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/loops_splitter.h
rename to Sapfor/_src/Transformations/loops_splitter.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/loops_unrolling.cpp b/Sapfor/_src/Transformations/loops_unrolling.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/loops_unrolling.cpp
rename to Sapfor/_src/Transformations/loops_unrolling.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/loops_unrolling.h b/Sapfor/_src/Transformations/loops_unrolling.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/loops_unrolling.h
rename to Sapfor/_src/Transformations/loops_unrolling.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/private_arrays_resizing.cpp b/Sapfor/_src/Transformations/private_arrays_resizing.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/private_arrays_resizing.cpp
rename to Sapfor/_src/Transformations/private_arrays_resizing.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/private_arrays_resizing.h b/Sapfor/_src/Transformations/private_arrays_resizing.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/private_arrays_resizing.h
rename to Sapfor/_src/Transformations/private_arrays_resizing.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/private_removing.cpp b/Sapfor/_src/Transformations/private_removing.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/private_removing.cpp
rename to Sapfor/_src/Transformations/private_removing.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/private_removing.h b/Sapfor/_src/Transformations/private_removing.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/private_removing.h
rename to Sapfor/_src/Transformations/private_removing.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/replace_dist_arrays_in_io.cpp b/Sapfor/_src/Transformations/replace_dist_arrays_in_io.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/replace_dist_arrays_in_io.cpp
rename to Sapfor/_src/Transformations/replace_dist_arrays_in_io.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/replace_dist_arrays_in_io.h b/Sapfor/_src/Transformations/replace_dist_arrays_in_io.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/replace_dist_arrays_in_io.h
rename to Sapfor/_src/Transformations/replace_dist_arrays_in_io.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/set_implicit_none.cpp b/Sapfor/_src/Transformations/set_implicit_none.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/set_implicit_none.cpp
rename to Sapfor/_src/Transformations/set_implicit_none.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/set_implicit_none.h b/Sapfor/_src/Transformations/set_implicit_none.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/set_implicit_none.h
rename to Sapfor/_src/Transformations/set_implicit_none.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/swap_array_dims.cpp b/Sapfor/_src/Transformations/swap_array_dims.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/swap_array_dims.cpp
rename to Sapfor/_src/Transformations/swap_array_dims.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/swap_array_dims.h b/Sapfor/_src/Transformations/swap_array_dims.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/swap_array_dims.h
rename to Sapfor/_src/Transformations/swap_array_dims.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/uniq_call_chain_dup.cpp b/Sapfor/_src/Transformations/uniq_call_chain_dup.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/uniq_call_chain_dup.cpp
rename to Sapfor/_src/Transformations/uniq_call_chain_dup.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/uniq_call_chain_dup.h b/Sapfor/_src/Transformations/uniq_call_chain_dup.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/uniq_call_chain_dup.h
rename to Sapfor/_src/Transformations/uniq_call_chain_dup.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/AstWrapper.h b/Sapfor/_src/Utils/AstWrapper.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Utils/AstWrapper.h
rename to Sapfor/_src/Utils/AstWrapper.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/BoostStackTrace.cpp b/Sapfor/_src/Utils/BoostStackTrace.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Utils/BoostStackTrace.cpp
rename to Sapfor/_src/Utils/BoostStackTrace.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/CommonBlock.h b/Sapfor/_src/Utils/CommonBlock.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Utils/CommonBlock.h
rename to Sapfor/_src/Utils/CommonBlock.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/DefUseList.h b/Sapfor/_src/Utils/DefUseList.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Utils/DefUseList.h
rename to Sapfor/_src/Utils/DefUseList.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/PassManager.h b/Sapfor/_src/Utils/PassManager.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Utils/PassManager.h
rename to Sapfor/_src/Utils/PassManager.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/RationalNum.cpp b/Sapfor/_src/Utils/RationalNum.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Utils/RationalNum.cpp
rename to Sapfor/_src/Utils/RationalNum.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/RationalNum.h b/Sapfor/_src/Utils/RationalNum.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Utils/RationalNum.h
rename to Sapfor/_src/Utils/RationalNum.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/SgUtils.cpp b/Sapfor/_src/Utils/SgUtils.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Utils/SgUtils.cpp
rename to Sapfor/_src/Utils/SgUtils.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/SgUtils.h b/Sapfor/_src/Utils/SgUtils.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Utils/SgUtils.h
rename to Sapfor/_src/Utils/SgUtils.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/errors.h b/Sapfor/_src/Utils/errors.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Utils/errors.h
rename to Sapfor/_src/Utils/errors.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/leak_detector.h b/Sapfor/_src/Utils/leak_detector.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Utils/leak_detector.h
rename to Sapfor/_src/Utils/leak_detector.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/module_utils.cpp b/Sapfor/_src/Utils/module_utils.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Utils/module_utils.cpp
rename to Sapfor/_src/Utils/module_utils.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/module_utils.h b/Sapfor/_src/Utils/module_utils.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Utils/module_utils.h
rename to Sapfor/_src/Utils/module_utils.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/russian_errors_text.txt b/Sapfor/_src/Utils/russian_errors_text.txt
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Utils/russian_errors_text.txt
rename to Sapfor/_src/Utils/russian_errors_text.txt
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/types.h b/Sapfor/_src/Utils/types.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Utils/types.h
rename to Sapfor/_src/Utils/types.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/utils.cpp b/Sapfor/_src/Utils/utils.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Utils/utils.cpp
rename to Sapfor/_src/Utils/utils.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/utils.h b/Sapfor/_src/Utils/utils.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Utils/utils.h
rename to Sapfor/_src/Utils/utils.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/version.h b/Sapfor/_src/Utils/version.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Utils/version.h
rename to Sapfor/_src/Utils/version.h
diff --git a/sapfor/experts/Sapfor_2017/_src/VerificationCode/CorrectVarDecl.cpp b/Sapfor/_src/VerificationCode/CorrectVarDecl.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/VerificationCode/CorrectVarDecl.cpp
rename to Sapfor/_src/VerificationCode/CorrectVarDecl.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/VerificationCode/IncludeChecker.cpp b/Sapfor/_src/VerificationCode/IncludeChecker.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/VerificationCode/IncludeChecker.cpp
rename to Sapfor/_src/VerificationCode/IncludeChecker.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/VerificationCode/StructureChecker.cpp b/Sapfor/_src/VerificationCode/StructureChecker.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/VerificationCode/StructureChecker.cpp
rename to Sapfor/_src/VerificationCode/StructureChecker.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/VerificationCode/VerifySageStructures.cpp b/Sapfor/_src/VerificationCode/VerifySageStructures.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/VerificationCode/VerifySageStructures.cpp
rename to Sapfor/_src/VerificationCode/VerifySageStructures.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/VerificationCode/verifications.h b/Sapfor/_src/VerificationCode/verifications.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/VerificationCode/verifications.h
rename to Sapfor/_src/VerificationCode/verifications.h
diff --git a/sapfor/experts/Sapfor_2017/_src/VisualizerCalls/BuildGraph.cpp b/Sapfor/_src/VisualizerCalls/BuildGraph.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/VisualizerCalls/BuildGraph.cpp
rename to Sapfor/_src/VisualizerCalls/BuildGraph.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/VisualizerCalls/BuildGraph.h b/Sapfor/_src/VisualizerCalls/BuildGraph.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/VisualizerCalls/BuildGraph.h
rename to Sapfor/_src/VisualizerCalls/BuildGraph.h
diff --git a/sapfor/experts/Sapfor_2017/_src/VisualizerCalls/SendMessage.cpp b/Sapfor/_src/VisualizerCalls/SendMessage.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/VisualizerCalls/SendMessage.cpp
rename to Sapfor/_src/VisualizerCalls/SendMessage.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/VisualizerCalls/SendMessage.h b/Sapfor/_src/VisualizerCalls/SendMessage.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/VisualizerCalls/SendMessage.h
rename to Sapfor/_src/VisualizerCalls/SendMessage.h
diff --git a/sapfor/experts/Sapfor_2017/_src/VisualizerCalls/get_information.cpp b/Sapfor/_src/VisualizerCalls/get_information.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/VisualizerCalls/get_information.cpp
rename to Sapfor/_src/VisualizerCalls/get_information.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/VisualizerCalls/get_information.h b/Sapfor/_src/VisualizerCalls/get_information.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/VisualizerCalls/get_information.h
rename to Sapfor/_src/VisualizerCalls/get_information.h
diff --git a/sapfor/experts/Sapfor_2017/_src/VisualizerCalls/graphLayout/algebra.cpp b/Sapfor/_src/VisualizerCalls/graphLayout/algebra.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/VisualizerCalls/graphLayout/algebra.cpp
rename to Sapfor/_src/VisualizerCalls/graphLayout/algebra.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/VisualizerCalls/graphLayout/algebra.hpp b/Sapfor/_src/VisualizerCalls/graphLayout/algebra.hpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/VisualizerCalls/graphLayout/algebra.hpp
rename to Sapfor/_src/VisualizerCalls/graphLayout/algebra.hpp
diff --git a/sapfor/experts/Sapfor_2017/_src/VisualizerCalls/graphLayout/fruchterman_reingold.cpp b/Sapfor/_src/VisualizerCalls/graphLayout/fruchterman_reingold.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/VisualizerCalls/graphLayout/fruchterman_reingold.cpp
rename to Sapfor/_src/VisualizerCalls/graphLayout/fruchterman_reingold.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/VisualizerCalls/graphLayout/fruchterman_reingold.hpp b/Sapfor/_src/VisualizerCalls/graphLayout/fruchterman_reingold.hpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/VisualizerCalls/graphLayout/fruchterman_reingold.hpp
rename to Sapfor/_src/VisualizerCalls/graphLayout/fruchterman_reingold.hpp
diff --git a/sapfor/experts/Sapfor_2017/_src/VisualizerCalls/graphLayout/kamada_kawai.cpp b/Sapfor/_src/VisualizerCalls/graphLayout/kamada_kawai.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/VisualizerCalls/graphLayout/kamada_kawai.cpp
rename to Sapfor/_src/VisualizerCalls/graphLayout/kamada_kawai.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/VisualizerCalls/graphLayout/kamada_kawai.hpp b/Sapfor/_src/VisualizerCalls/graphLayout/kamada_kawai.hpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/VisualizerCalls/graphLayout/kamada_kawai.hpp
rename to Sapfor/_src/VisualizerCalls/graphLayout/kamada_kawai.hpp
diff --git a/sapfor/experts/Sapfor_2017/_src/VisualizerCalls/graphLayout/layout.cpp b/Sapfor/_src/VisualizerCalls/graphLayout/layout.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/VisualizerCalls/graphLayout/layout.cpp
rename to Sapfor/_src/VisualizerCalls/graphLayout/layout.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/VisualizerCalls/graphLayout/layout.hpp b/Sapfor/_src/VisualizerCalls/graphLayout/layout.hpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/VisualizerCalls/graphLayout/layout.hpp
rename to Sapfor/_src/VisualizerCalls/graphLayout/layout.hpp
diff --git a/sapfor/experts/Sapfor_2017/_src/VisualizerCalls/graphLayout/nodesoup.cpp b/Sapfor/_src/VisualizerCalls/graphLayout/nodesoup.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/VisualizerCalls/graphLayout/nodesoup.cpp
rename to Sapfor/_src/VisualizerCalls/graphLayout/nodesoup.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/VisualizerCalls/graphLayout/nodesoup.hpp b/Sapfor/_src/VisualizerCalls/graphLayout/nodesoup.hpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/VisualizerCalls/graphLayout/nodesoup.hpp
rename to Sapfor/_src/VisualizerCalls/graphLayout/nodesoup.hpp
diff --git a/sapfor/experts/Sapfor_2017/_test/inliner/alex.f b/Sapfor/_test/inliner/alex.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/inliner/alex.f
rename to Sapfor/_test/inliner/alex.f
diff --git a/sapfor/experts/Sapfor_2017/_test/inliner/array_sum.f b/Sapfor/_test/inliner/array_sum.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/inliner/array_sum.f
rename to Sapfor/_test/inliner/array_sum.f
diff --git a/sapfor/experts/Sapfor_2017/_test/inliner/inlineFunctionWithAllocatable.f90 b/Sapfor/_test/inliner/inlineFunctionWithAllocatable.f90
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/inliner/inlineFunctionWithAllocatable.f90
rename to Sapfor/_test/inliner/inlineFunctionWithAllocatable.f90
diff --git a/sapfor/experts/Sapfor_2017/_test/inliner/sub.f b/Sapfor/_test/inliner/sub.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/inliner/sub.f
rename to Sapfor/_test/inliner/sub.f
diff --git a/sapfor/experts/Sapfor_2017/_test/inliner/test.f b/Sapfor/_test/inliner/test.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/inliner/test.f
rename to Sapfor/_test/inliner/test.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/entry_err1.f b/Sapfor/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/entry_err1.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/entry_err1.f
rename to Sapfor/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/entry_err1.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/entry_err2.f b/Sapfor/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/entry_err2.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/entry_err2.f
rename to Sapfor/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/entry_err2.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/etnry_ok1.f b/Sapfor/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/etnry_ok1.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/etnry_ok1.f
rename to Sapfor/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/etnry_ok1.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/etnry_ok2.f b/Sapfor/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/etnry_ok2.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/etnry_ok2.f
rename to Sapfor/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/etnry_ok2.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/goto_err1.f b/Sapfor/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/goto_err1.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/goto_err1.f
rename to Sapfor/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/goto_err1.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/goto_ok1.f b/Sapfor/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/goto_ok1.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/goto_ok1.f
rename to Sapfor/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/goto_ok1.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/check_args_decl/arg_decl_test_err1.f b/Sapfor/_test/sapfor/check_args_decl/arg_decl_test_err1.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/check_args_decl/arg_decl_test_err1.f
rename to Sapfor/_test/sapfor/check_args_decl/arg_decl_test_err1.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/check_args_decl/arg_decl_test_err2.f b/Sapfor/_test/sapfor/check_args_decl/arg_decl_test_err2.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/check_args_decl/arg_decl_test_err2.f
rename to Sapfor/_test/sapfor/check_args_decl/arg_decl_test_err2.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/check_args_decl/arg_decl_test_err3.f b/Sapfor/_test/sapfor/check_args_decl/arg_decl_test_err3.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/check_args_decl/arg_decl_test_err3.f
rename to Sapfor/_test/sapfor/check_args_decl/arg_decl_test_err3.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/check_args_decl/arg_decl_test_ok1.f b/Sapfor/_test/sapfor/check_args_decl/arg_decl_test_ok1.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/check_args_decl/arg_decl_test_ok1.f
rename to Sapfor/_test/sapfor/check_args_decl/arg_decl_test_ok1.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/check_args_decl/arg_decl_test_ok2.f b/Sapfor/_test/sapfor/check_args_decl/arg_decl_test_ok2.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/check_args_decl/arg_decl_test_ok2.f
rename to Sapfor/_test/sapfor/check_args_decl/arg_decl_test_ok2.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/check_args_decl/arg_decl_test_ok3.f b/Sapfor/_test/sapfor/check_args_decl/arg_decl_test_ok3.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/check_args_decl/arg_decl_test_ok3.f
rename to Sapfor/_test/sapfor/check_args_decl/arg_decl_test_ok3.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/check_args_decl/arg_decl_test_wr1.f b/Sapfor/_test/sapfor/check_args_decl/arg_decl_test_wr1.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/check_args_decl/arg_decl_test_wr1.f
rename to Sapfor/_test/sapfor/check_args_decl/arg_decl_test_wr1.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/check_args_decl/arg_decl_test_wr3.f b/Sapfor/_test/sapfor/check_args_decl/arg_decl_test_wr3.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/check_args_decl/arg_decl_test_wr3.f
rename to Sapfor/_test/sapfor/check_args_decl/arg_decl_test_wr3.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/checkpoint/checkpoint.f90 b/Sapfor/_test/sapfor/checkpoint/checkpoint.f90
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/checkpoint/checkpoint.f90
rename to Sapfor/_test/sapfor/checkpoint/checkpoint.f90
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/checkpoint/checkpoint2.f90 b/Sapfor/_test/sapfor/checkpoint/checkpoint2.f90
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/checkpoint/checkpoint2.f90
rename to Sapfor/_test/sapfor/checkpoint/checkpoint2.f90
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/convert_assign_to_loop/anyArguments_fromLittleToBig.f90 b/Sapfor/_test/sapfor/convert_assign_to_loop/anyArguments_fromLittleToBig.f90
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/convert_assign_to_loop/anyArguments_fromLittleToBig.f90
rename to Sapfor/_test/sapfor/convert_assign_to_loop/anyArguments_fromLittleToBig.f90
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/convert_assign_to_loop/assign_with_sections.f b/Sapfor/_test/sapfor/convert_assign_to_loop/assign_with_sections.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/convert_assign_to_loop/assign_with_sections.f
rename to Sapfor/_test/sapfor/convert_assign_to_loop/assign_with_sections.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/convert_assign_to_loop/simple_assign.f b/Sapfor/_test/sapfor/convert_assign_to_loop/simple_assign.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/convert_assign_to_loop/simple_assign.f
rename to Sapfor/_test/sapfor/convert_assign_to_loop/simple_assign.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/convert_assign_to_loop/two_dimensional_assign.f b/Sapfor/_test/sapfor/convert_assign_to_loop/two_dimensional_assign.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/convert_assign_to_loop/two_dimensional_assign.f
rename to Sapfor/_test/sapfor/convert_assign_to_loop/two_dimensional_assign.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/convert_expr_to_loop/expr_with_sections.f b/Sapfor/_test/sapfor/convert_expr_to_loop/expr_with_sections.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/convert_expr_to_loop/expr_with_sections.f
rename to Sapfor/_test/sapfor/convert_expr_to_loop/expr_with_sections.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/convert_expr_to_loop/simple_expr.f b/Sapfor/_test/sapfor/convert_expr_to_loop/simple_expr.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/convert_expr_to_loop/simple_expr.f
rename to Sapfor/_test/sapfor/convert_expr_to_loop/simple_expr.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/convert_expr_to_loop/two_dimensional_expr.f b/Sapfor/_test/sapfor/convert_expr_to_loop/two_dimensional_expr.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/convert_expr_to_loop/two_dimensional_expr.f
rename to Sapfor/_test/sapfor/convert_expr_to_loop/two_dimensional_expr.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/convert_sum_to_loop/simple_sum.f b/Sapfor/_test/sapfor/convert_sum_to_loop/simple_sum.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/convert_sum_to_loop/simple_sum.f
rename to Sapfor/_test/sapfor/convert_sum_to_loop/simple_sum.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/convert_sum_to_loop/sum_with_sections.f b/Sapfor/_test/sapfor/convert_sum_to_loop/sum_with_sections.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/convert_sum_to_loop/sum_with_sections.f
rename to Sapfor/_test/sapfor/convert_sum_to_loop/sum_with_sections.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/convert_sum_to_loop/two_dimensional_sum.f b/Sapfor/_test/sapfor/convert_sum_to_loop/two_dimensional_sum.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/convert_sum_to_loop/two_dimensional_sum.f
rename to Sapfor/_test/sapfor/convert_sum_to_loop/two_dimensional_sum.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/convert_where_to_loop/simple_where.f b/Sapfor/_test/sapfor/convert_where_to_loop/simple_where.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/convert_where_to_loop/simple_where.f
rename to Sapfor/_test/sapfor/convert_where_to_loop/simple_where.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/convert_where_to_loop/two_dimensional_where.f b/Sapfor/_test/sapfor/convert_where_to_loop/two_dimensional_where.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/convert_where_to_loop/two_dimensional_where.f
rename to Sapfor/_test/sapfor/convert_where_to_loop/two_dimensional_where.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/convert_where_to_loop/where_with_sections.f b/Sapfor/_test/sapfor/convert_where_to_loop/where_with_sections.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/convert_where_to_loop/where_with_sections.f
rename to Sapfor/_test/sapfor/convert_where_to_loop/where_with_sections.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/create_nested_loops/program.expected.f90 b/Sapfor/_test/sapfor/create_nested_loops/program.expected.f90
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/create_nested_loops/program.expected.f90
rename to Sapfor/_test/sapfor/create_nested_loops/program.expected.f90
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/create_nested_loops/program.f90 b/Sapfor/_test/sapfor/create_nested_loops/program.f90
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/create_nested_loops/program.f90
rename to Sapfor/_test/sapfor/create_nested_loops/program.f90
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/create_nested_loops/test.bat b/Sapfor/_test/sapfor/create_nested_loops/test.bat
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/create_nested_loops/test.bat
rename to Sapfor/_test/sapfor/create_nested_loops/test.bat
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/create_nested_loops/test.sh b/Sapfor/_test/sapfor/create_nested_loops/test.sh
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/create_nested_loops/test.sh
rename to Sapfor/_test/sapfor/create_nested_loops/test.sh
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/fission_and_private_exp/fission_priv_exp.f90 b/Sapfor/_test/sapfor/fission_and_private_exp/fission_priv_exp.f90
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/fission_and_private_exp/fission_priv_exp.f90
rename to Sapfor/_test/sapfor/fission_and_private_exp/fission_priv_exp.f90
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/loops_combiner/test_1.for b/Sapfor/_test/sapfor/loops_combiner/test_1.for
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/loops_combiner/test_1.for
rename to Sapfor/_test/sapfor/loops_combiner/test_1.for
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/loops_combiner/test_2.for b/Sapfor/_test/sapfor/loops_combiner/test_2.for
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/loops_combiner/test_2.for
rename to Sapfor/_test/sapfor/loops_combiner/test_2.for
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/loops_combiner/test_3.for b/Sapfor/_test/sapfor/loops_combiner/test_3.for
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/loops_combiner/test_3.for
rename to Sapfor/_test/sapfor/loops_combiner/test_3.for
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/loops_combiner/test_4.for b/Sapfor/_test/sapfor/loops_combiner/test_4.for
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/loops_combiner/test_4.for
rename to Sapfor/_test/sapfor/loops_combiner/test_4.for
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/loops_combiner/test_5.for b/Sapfor/_test/sapfor/loops_combiner/test_5.for
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/loops_combiner/test_5.for
rename to Sapfor/_test/sapfor/loops_combiner/test_5.for
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/merge_regions/array_read_before_write.in b/Sapfor/_test/sapfor/merge_regions/array_read_before_write.in
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/merge_regions/array_read_before_write.in
rename to Sapfor/_test/sapfor/merge_regions/array_read_before_write.in
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/merge_regions/array_read_before_write.out b/Sapfor/_test/sapfor/merge_regions/array_read_before_write.out
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/merge_regions/array_read_before_write.out
rename to Sapfor/_test/sapfor/merge_regions/array_read_before_write.out
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/merge_regions/read_before_read.in b/Sapfor/_test/sapfor/merge_regions/read_before_read.in
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/merge_regions/read_before_read.in
rename to Sapfor/_test/sapfor/merge_regions/read_before_read.in
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/merge_regions/read_before_read.out b/Sapfor/_test/sapfor/merge_regions/read_before_read.out
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/merge_regions/read_before_read.out
rename to Sapfor/_test/sapfor/merge_regions/read_before_read.out
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/merge_regions/read_in_loop_header.in b/Sapfor/_test/sapfor/merge_regions/read_in_loop_header.in
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/merge_regions/read_in_loop_header.in
rename to Sapfor/_test/sapfor/merge_regions/read_in_loop_header.in
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/merge_regions/read_in_loop_header.out b/Sapfor/_test/sapfor/merge_regions/read_in_loop_header.out
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/merge_regions/read_in_loop_header.out
rename to Sapfor/_test/sapfor/merge_regions/read_in_loop_header.out
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/merge_regions/var_modified_in_fun.in b/Sapfor/_test/sapfor/merge_regions/var_modified_in_fun.in
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/merge_regions/var_modified_in_fun.in
rename to Sapfor/_test/sapfor/merge_regions/var_modified_in_fun.in
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/merge_regions/var_modified_in_fun.out b/Sapfor/_test/sapfor/merge_regions/var_modified_in_fun.out
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/merge_regions/var_modified_in_fun.out
rename to Sapfor/_test/sapfor/merge_regions/var_modified_in_fun.out
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/merge_regions/var_read_before_write.in b/Sapfor/_test/sapfor/merge_regions/var_read_before_write.in
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/merge_regions/var_read_before_write.in
rename to Sapfor/_test/sapfor/merge_regions/var_read_before_write.in
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/merge_regions/var_read_before_write.out b/Sapfor/_test/sapfor/merge_regions/var_read_before_write.out
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/merge_regions/var_read_before_write.out
rename to Sapfor/_test/sapfor/merge_regions/var_read_before_write.out
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/merge_regions/write_before_read.in b/Sapfor/_test/sapfor/merge_regions/write_before_read.in
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/merge_regions/write_before_read.in
rename to Sapfor/_test/sapfor/merge_regions/write_before_read.in
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/merge_regions/write_before_read.out b/Sapfor/_test/sapfor/merge_regions/write_before_read.out
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/merge_regions/write_before_read.out
rename to Sapfor/_test/sapfor/merge_regions/write_before_read.out
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/merge_regions/write_before_write.in b/Sapfor/_test/sapfor/merge_regions/write_before_write.in
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/merge_regions/write_before_write.in
rename to Sapfor/_test/sapfor/merge_regions/write_before_write.in
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/merge_regions/write_before_write.out b/Sapfor/_test/sapfor/merge_regions/write_before_write.out
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/merge_regions/write_before_write.out
rename to Sapfor/_test/sapfor/merge_regions/write_before_write.out
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/parameter/magnit_3d.for b/Sapfor/_test/sapfor/parameter/magnit_3d.for
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/parameter/magnit_3d.for
rename to Sapfor/_test/sapfor/parameter/magnit_3d.for
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/parameter/mycom.for b/Sapfor/_test/sapfor/parameter/mycom.for
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/parameter/mycom.for
rename to Sapfor/_test/sapfor/parameter/mycom.for
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/parameter/parameter.f90 b/Sapfor/_test/sapfor/parameter/parameter.f90
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/parameter/parameter.f90
rename to Sapfor/_test/sapfor/parameter/parameter.f90
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/private_removing/test.f b/Sapfor/_test/sapfor/private_removing/test.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/private_removing/test.f
rename to Sapfor/_test/sapfor/private_removing/test.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/private_removing/test_cannot_remove.f b/Sapfor/_test/sapfor/private_removing/test_cannot_remove.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/private_removing/test_cannot_remove.f
rename to Sapfor/_test/sapfor/private_removing/test_cannot_remove.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/private_removing/test_cascade.f b/Sapfor/_test/sapfor/private_removing/test_cascade.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/private_removing/test_cascade.f
rename to Sapfor/_test/sapfor/private_removing/test_cascade.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/shrink/error.f b/Sapfor/_test/sapfor/shrink/error.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/shrink/error.f
rename to Sapfor/_test/sapfor/shrink/error.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/shrink/error2.f b/Sapfor/_test/sapfor/shrink/error2.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/shrink/error2.f
rename to Sapfor/_test/sapfor/shrink/error2.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/shrink/error3.f b/Sapfor/_test/sapfor/shrink/error3.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/shrink/error3.f
rename to Sapfor/_test/sapfor/shrink/error3.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/shrink/shrink.f b/Sapfor/_test/sapfor/shrink/shrink.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/shrink/shrink.f
rename to Sapfor/_test/sapfor/shrink/shrink.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/shrink/shrink2.f b/Sapfor/_test/sapfor/shrink/shrink2.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/shrink/shrink2.f
rename to Sapfor/_test/sapfor/shrink/shrink2.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/shrink/shrink3.f b/Sapfor/_test/sapfor/shrink/shrink3.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/shrink/shrink3.f
rename to Sapfor/_test/sapfor/shrink/shrink3.f
diff --git a/sapfor/experts/Sapfor_2017/paths.default.txt b/Sapfor/paths.default.txt
similarity index 100%
rename from sapfor/experts/Sapfor_2017/paths.default.txt
rename to Sapfor/paths.default.txt