diff --git a/.vscode/settings.json b/.vscode/settings.json
index 34271f4..6c20a6f 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -83,6 +83,11 @@
         "io_context": "cpp",
         "netfwd": "cpp",
         "socket": "cpp",
-        "timer": "cpp"
+        "timer": "cpp",
+        "compare": "cpp",
+        "concepts": "cpp",
+        "numbers": "cpp",
+        "semaphore": "cpp",
+        "stop_token": "cpp"
     }
 }
\ No newline at end of file
diff --git a/docker/light b/docker/light
index ded0dcd..da7d021 100755
Binary files a/docker/light and b/docker/light differ
diff --git a/light b/light
index fe12778..da7d021 100755
Binary files a/light and b/light differ
diff --git a/run.sh b/run.sh
new file mode 100755
index 0000000..edf588e
--- /dev/null
+++ b/run.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+make -j 16 && mpirun -np 2 --allow-run-as-root ./light -i data/class_1_easy_10_0.cnf --share=1 --threads=4
\ No newline at end of file
diff --git a/run_docker.sh b/run_docker.sh
index 9a59930..5ad3961 100755
--- a/run_docker.sh
+++ b/run_docker.sh
@@ -9,7 +9,7 @@ cp ../light .
 DOCKER_NETWORK="mallob-test"
 
 
-docker build --no-cache -f common.dockerfil -t light:common .
+docker build --no-cache -f common.dockerfile -t light:common .
 docker build --no-cache -f leader.dockerfile -t light:leader .
 docker build --no-cache -f worker.dockerfile -t light:worker .
 
diff --git a/src-light-master/cmdline.h b/simplify/cmdline.h
similarity index 100%
rename from src-light-master/cmdline.h
rename to simplify/cmdline.h
diff --git a/src-light-master/light-master b/simplify/light-master
similarity index 100%
rename from src-light-master/light-master
rename to simplify/light-master
diff --git a/src-light-master/makefile b/simplify/makefile
similarity index 100%
rename from src-light-master/makefile
rename to simplify/makefile
diff --git a/src-light-master/master.cpp b/simplify/master.cpp
similarity index 100%
rename from src-light-master/master.cpp
rename to simplify/master.cpp
diff --git a/src-light-master/master.h b/simplify/master.h
similarity index 100%
rename from src-light-master/master.h
rename to simplify/master.h
diff --git a/src-light-master/paras.cpp b/simplify/paras.cpp
similarity index 100%
rename from src-light-master/paras.cpp
rename to simplify/paras.cpp
diff --git a/src-light-master/paras.hpp b/simplify/paras.hpp
similarity index 100%
rename from src-light-master/paras.hpp
rename to simplify/paras.hpp
diff --git a/src-light-master/preprocess/binary.cpp b/simplify/preprocess/binary.cpp
similarity index 100%
rename from src-light-master/preprocess/binary.cpp
rename to simplify/preprocess/binary.cpp
diff --git a/src-light-master/preprocess/card.cpp b/simplify/preprocess/card.cpp
similarity index 100%
rename from src-light-master/preprocess/card.cpp
rename to simplify/preprocess/card.cpp
diff --git a/src-light-master/preprocess/gauss.cpp b/simplify/preprocess/gauss.cpp
similarity index 100%
rename from src-light-master/preprocess/gauss.cpp
rename to simplify/preprocess/gauss.cpp
diff --git a/src-light-master/preprocess/m4ri-20140914/.libs/libm4ri-0.0.20140914.so b/simplify/preprocess/m4ri-20140914/.libs/libm4ri-0.0.20140914.so
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/.libs/libm4ri-0.0.20140914.so
rename to simplify/preprocess/m4ri-20140914/.libs/libm4ri-0.0.20140914.so
diff --git a/src-light-master/preprocess/m4ri-20140914/.libs/libm4ri.a b/simplify/preprocess/m4ri-20140914/.libs/libm4ri.a
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/.libs/libm4ri.a
rename to simplify/preprocess/m4ri-20140914/.libs/libm4ri.a
diff --git a/src-light-master/preprocess/m4ri-20140914/.libs/libm4ri.la b/simplify/preprocess/m4ri-20140914/.libs/libm4ri.la
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/.libs/libm4ri.la
rename to simplify/preprocess/m4ri-20140914/.libs/libm4ri.la
diff --git a/src-light-master/preprocess/m4ri-20140914/.libs/libm4ri.lai b/simplify/preprocess/m4ri-20140914/.libs/libm4ri.lai
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/.libs/libm4ri.lai
rename to simplify/preprocess/m4ri-20140914/.libs/libm4ri.lai
diff --git a/src-light-master/preprocess/m4ri-20140914/.libs/libm4ri.so b/simplify/preprocess/m4ri-20140914/.libs/libm4ri.so
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/.libs/libm4ri.so
rename to simplify/preprocess/m4ri-20140914/.libs/libm4ri.so
diff --git a/src-light-master/preprocess/m4ri-20140914/AUTHORS b/simplify/preprocess/m4ri-20140914/AUTHORS
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/AUTHORS
rename to simplify/preprocess/m4ri-20140914/AUTHORS
diff --git a/src-light-master/preprocess/m4ri-20140914/COPYING b/simplify/preprocess/m4ri-20140914/COPYING
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/COPYING
rename to simplify/preprocess/m4ri-20140914/COPYING
diff --git a/src-light-master/preprocess/m4ri-20140914/ChangeLog b/simplify/preprocess/m4ri-20140914/ChangeLog
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/ChangeLog
rename to simplify/preprocess/m4ri-20140914/ChangeLog
diff --git a/src-light-master/preprocess/m4ri-20140914/INSTALL b/simplify/preprocess/m4ri-20140914/INSTALL
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/INSTALL
rename to simplify/preprocess/m4ri-20140914/INSTALL
diff --git a/src-light-master/preprocess/m4ri-20140914/Makefile b/simplify/preprocess/m4ri-20140914/Makefile
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/Makefile
rename to simplify/preprocess/m4ri-20140914/Makefile
diff --git a/src-light-master/preprocess/m4ri-20140914/Makefile.am b/simplify/preprocess/m4ri-20140914/Makefile.am
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/Makefile.am
rename to simplify/preprocess/m4ri-20140914/Makefile.am
diff --git a/src-light-master/preprocess/m4ri-20140914/Makefile.in b/simplify/preprocess/m4ri-20140914/Makefile.in
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/Makefile.in
rename to simplify/preprocess/m4ri-20140914/Makefile.in
diff --git a/src-light-master/preprocess/m4ri-20140914/NEWS b/simplify/preprocess/m4ri-20140914/NEWS
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/NEWS
rename to simplify/preprocess/m4ri-20140914/NEWS
diff --git a/src-light-master/preprocess/m4ri-20140914/aclocal.m4 b/simplify/preprocess/m4ri-20140914/aclocal.m4
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/aclocal.m4
rename to simplify/preprocess/m4ri-20140914/aclocal.m4
diff --git a/src-light-master/preprocess/m4ri-20140914/compile b/simplify/preprocess/m4ri-20140914/compile
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/compile
rename to simplify/preprocess/m4ri-20140914/compile
diff --git a/src-light-master/preprocess/m4ri-20140914/config.guess b/simplify/preprocess/m4ri-20140914/config.guess
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/config.guess
rename to simplify/preprocess/m4ri-20140914/config.guess
diff --git a/src-light-master/preprocess/m4ri-20140914/config.log b/simplify/preprocess/m4ri-20140914/config.log
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/config.log
rename to simplify/preprocess/m4ri-20140914/config.log
diff --git a/src-light-master/preprocess/m4ri-20140914/config.status b/simplify/preprocess/m4ri-20140914/config.status
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/config.status
rename to simplify/preprocess/m4ri-20140914/config.status
diff --git a/src-light-master/preprocess/m4ri-20140914/config.sub b/simplify/preprocess/m4ri-20140914/config.sub
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/config.sub
rename to simplify/preprocess/m4ri-20140914/config.sub
diff --git a/src-light-master/preprocess/m4ri-20140914/configure b/simplify/preprocess/m4ri-20140914/configure
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/configure
rename to simplify/preprocess/m4ri-20140914/configure
diff --git a/src-light-master/preprocess/m4ri-20140914/configure.ac b/simplify/preprocess/m4ri-20140914/configure.ac
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/configure.ac
rename to simplify/preprocess/m4ri-20140914/configure.ac
diff --git a/src-light-master/preprocess/m4ri-20140914/depcomp b/simplify/preprocess/m4ri-20140914/depcomp
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/depcomp
rename to simplify/preprocess/m4ri-20140914/depcomp
diff --git a/src-light-master/preprocess/m4ri-20140914/install-sh b/simplify/preprocess/m4ri-20140914/install-sh
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/install-sh
rename to simplify/preprocess/m4ri-20140914/install-sh
diff --git a/src-light-master/preprocess/m4ri-20140914/libm4ri.la b/simplify/preprocess/m4ri-20140914/libm4ri.la
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/libm4ri.la
rename to simplify/preprocess/m4ri-20140914/libm4ri.la
diff --git a/src-light-master/preprocess/m4ri-20140914/libtool b/simplify/preprocess/m4ri-20140914/libtool
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/libtool
rename to simplify/preprocess/m4ri-20140914/libtool
diff --git a/src-light-master/preprocess/m4ri-20140914/ltmain.sh b/simplify/preprocess/m4ri-20140914/ltmain.sh
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/ltmain.sh
rename to simplify/preprocess/m4ri-20140914/ltmain.sh
diff --git a/src-light-master/preprocess/m4ri-20140914/m4/ax_cache_size.m4 b/simplify/preprocess/m4ri-20140914/m4/ax_cache_size.m4
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4/ax_cache_size.m4
rename to simplify/preprocess/m4ri-20140914/m4/ax_cache_size.m4
diff --git a/src-light-master/preprocess/m4ri-20140914/m4/ax_cache_size_tune.m4 b/simplify/preprocess/m4ri-20140914/m4/ax_cache_size_tune.m4
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4/ax_cache_size_tune.m4
rename to simplify/preprocess/m4ri-20140914/m4/ax_cache_size_tune.m4
diff --git a/src-light-master/preprocess/m4ri-20140914/m4/ax_check_compiler_flags.m4 b/simplify/preprocess/m4ri-20140914/m4/ax_check_compiler_flags.m4
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4/ax_check_compiler_flags.m4
rename to simplify/preprocess/m4ri-20140914/m4/ax_check_compiler_flags.m4
diff --git a/src-light-master/preprocess/m4ri-20140914/m4/ax_cpu_vendor.m4 b/simplify/preprocess/m4ri-20140914/m4/ax_cpu_vendor.m4
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4/ax_cpu_vendor.m4
rename to simplify/preprocess/m4ri-20140914/m4/ax_cpu_vendor.m4
diff --git a/src-light-master/preprocess/m4ri-20140914/m4/ax_ext.m4 b/simplify/preprocess/m4ri-20140914/m4/ax_ext.m4
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4/ax_ext.m4
rename to simplify/preprocess/m4ri-20140914/m4/ax_ext.m4
diff --git a/src-light-master/preprocess/m4ri-20140914/m4/ax_func_posix_memalign.m4 b/simplify/preprocess/m4ri-20140914/m4/ax_func_posix_memalign.m4
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4/ax_func_posix_memalign.m4
rename to simplify/preprocess/m4ri-20140914/m4/ax_func_posix_memalign.m4
diff --git a/src-light-master/preprocess/m4ri-20140914/m4/ax_gcc_x86_cpuid.m4 b/simplify/preprocess/m4ri-20140914/m4/ax_gcc_x86_cpuid.m4
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4/ax_gcc_x86_cpuid.m4
rename to simplify/preprocess/m4ri-20140914/m4/ax_gcc_x86_cpuid.m4
diff --git a/src-light-master/preprocess/m4ri-20140914/m4/ax_guess_path_header.m4 b/simplify/preprocess/m4ri-20140914/m4/ax_guess_path_header.m4
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4/ax_guess_path_header.m4
rename to simplify/preprocess/m4ri-20140914/m4/ax_guess_path_header.m4
diff --git a/src-light-master/preprocess/m4ri-20140914/m4/ax_guess_path_lib.m4 b/simplify/preprocess/m4ri-20140914/m4/ax_guess_path_lib.m4
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4/ax_guess_path_lib.m4
rename to simplify/preprocess/m4ri-20140914/m4/ax_guess_path_lib.m4
diff --git a/src-light-master/preprocess/m4ri-20140914/m4/ax_openmp.m4 b/simplify/preprocess/m4ri-20140914/m4/ax_openmp.m4
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4/ax_openmp.m4
rename to simplify/preprocess/m4ri-20140914/m4/ax_openmp.m4
diff --git a/src-light-master/preprocess/m4ri-20140914/m4/libtool.m4 b/simplify/preprocess/m4ri-20140914/m4/libtool.m4
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4/libtool.m4
rename to simplify/preprocess/m4ri-20140914/m4/libtool.m4
diff --git a/src-light-master/preprocess/m4ri-20140914/m4/ltoptions.m4 b/simplify/preprocess/m4ri-20140914/m4/ltoptions.m4
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4/ltoptions.m4
rename to simplify/preprocess/m4ri-20140914/m4/ltoptions.m4
diff --git a/src-light-master/preprocess/m4ri-20140914/m4/ltsugar.m4 b/simplify/preprocess/m4ri-20140914/m4/ltsugar.m4
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4/ltsugar.m4
rename to simplify/preprocess/m4ri-20140914/m4/ltsugar.m4
diff --git a/src-light-master/preprocess/m4ri-20140914/m4/ltversion.m4 b/simplify/preprocess/m4ri-20140914/m4/ltversion.m4
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4/ltversion.m4
rename to simplify/preprocess/m4ri-20140914/m4/ltversion.m4
diff --git a/src-light-master/preprocess/m4ri-20140914/m4/lt~obsolete.m4 b/simplify/preprocess/m4ri-20140914/m4/lt~obsolete.m4
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4/lt~obsolete.m4
rename to simplify/preprocess/m4ri-20140914/m4/lt~obsolete.m4
diff --git a/src-light-master/preprocess/m4ri-20140914/m4/pkg.m4 b/simplify/preprocess/m4ri-20140914/m4/pkg.m4
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4/pkg.m4
rename to simplify/preprocess/m4ri-20140914/m4/pkg.m4
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri.pc b/simplify/preprocess/m4ri-20140914/m4ri.pc
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri.pc
rename to simplify/preprocess/m4ri-20140914/m4ri.pc
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri.pc.in b/simplify/preprocess/m4ri-20140914/m4ri.pc.in
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri.pc.in
rename to simplify/preprocess/m4ri-20140914/m4ri.pc.in
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/.deps/.dirstamp b/simplify/preprocess/m4ri-20140914/m4ri/.deps/.dirstamp
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/.deps/.dirstamp
rename to simplify/preprocess/m4ri-20140914/m4ri/.deps/.dirstamp
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/.deps/brilliantrussian.Plo b/simplify/preprocess/m4ri-20140914/m4ri/.deps/brilliantrussian.Plo
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/.deps/brilliantrussian.Plo
rename to simplify/preprocess/m4ri-20140914/m4ri/.deps/brilliantrussian.Plo
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/.deps/debug_dump.Plo b/simplify/preprocess/m4ri-20140914/m4ri/.deps/debug_dump.Plo
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/.deps/debug_dump.Plo
rename to simplify/preprocess/m4ri-20140914/m4ri/.deps/debug_dump.Plo
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/.deps/djb.Plo b/simplify/preprocess/m4ri-20140914/m4ri/.deps/djb.Plo
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/.deps/djb.Plo
rename to simplify/preprocess/m4ri-20140914/m4ri/.deps/djb.Plo
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/.deps/echelonform.Plo b/simplify/preprocess/m4ri-20140914/m4ri/.deps/echelonform.Plo
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/.deps/echelonform.Plo
rename to simplify/preprocess/m4ri-20140914/m4ri/.deps/echelonform.Plo
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/.deps/graycode.Plo b/simplify/preprocess/m4ri-20140914/m4ri/.deps/graycode.Plo
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/.deps/graycode.Plo
rename to simplify/preprocess/m4ri-20140914/m4ri/.deps/graycode.Plo
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/.deps/io.Plo b/simplify/preprocess/m4ri-20140914/m4ri/.deps/io.Plo
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/.deps/io.Plo
rename to simplify/preprocess/m4ri-20140914/m4ri/.deps/io.Plo
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/.deps/misc.Plo b/simplify/preprocess/m4ri-20140914/m4ri/.deps/misc.Plo
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/.deps/misc.Plo
rename to simplify/preprocess/m4ri-20140914/m4ri/.deps/misc.Plo
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/.deps/mmc.Plo b/simplify/preprocess/m4ri-20140914/m4ri/.deps/mmc.Plo
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/.deps/mmc.Plo
rename to simplify/preprocess/m4ri-20140914/m4ri/.deps/mmc.Plo
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/.deps/mp.Plo b/simplify/preprocess/m4ri-20140914/m4ri/.deps/mp.Plo
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/.deps/mp.Plo
rename to simplify/preprocess/m4ri-20140914/m4ri/.deps/mp.Plo
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/.deps/mzd.Plo b/simplify/preprocess/m4ri-20140914/m4ri/.deps/mzd.Plo
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/.deps/mzd.Plo
rename to simplify/preprocess/m4ri-20140914/m4ri/.deps/mzd.Plo
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/.deps/mzp.Plo b/simplify/preprocess/m4ri-20140914/m4ri/.deps/mzp.Plo
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/.deps/mzp.Plo
rename to simplify/preprocess/m4ri-20140914/m4ri/.deps/mzp.Plo
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/.deps/ple.Plo b/simplify/preprocess/m4ri-20140914/m4ri/.deps/ple.Plo
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/.deps/ple.Plo
rename to simplify/preprocess/m4ri-20140914/m4ri/.deps/ple.Plo
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/.deps/ple_russian.Plo b/simplify/preprocess/m4ri-20140914/m4ri/.deps/ple_russian.Plo
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/.deps/ple_russian.Plo
rename to simplify/preprocess/m4ri-20140914/m4ri/.deps/ple_russian.Plo
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/.deps/solve.Plo b/simplify/preprocess/m4ri-20140914/m4ri/.deps/solve.Plo
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/.deps/solve.Plo
rename to simplify/preprocess/m4ri-20140914/m4ri/.deps/solve.Plo
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/.deps/strassen.Plo b/simplify/preprocess/m4ri-20140914/m4ri/.deps/strassen.Plo
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/.deps/strassen.Plo
rename to simplify/preprocess/m4ri-20140914/m4ri/.deps/strassen.Plo
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/.deps/triangular.Plo b/simplify/preprocess/m4ri-20140914/m4ri/.deps/triangular.Plo
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/.deps/triangular.Plo
rename to simplify/preprocess/m4ri-20140914/m4ri/.deps/triangular.Plo
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/.deps/triangular_russian.Plo b/simplify/preprocess/m4ri-20140914/m4ri/.deps/triangular_russian.Plo
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/.deps/triangular_russian.Plo
rename to simplify/preprocess/m4ri-20140914/m4ri/.deps/triangular_russian.Plo
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/.dirstamp b/simplify/preprocess/m4ri-20140914/m4ri/.dirstamp
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/.dirstamp
rename to simplify/preprocess/m4ri-20140914/m4ri/.dirstamp
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/Doxyfile b/simplify/preprocess/m4ri-20140914/m4ri/Doxyfile
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/Doxyfile
rename to simplify/preprocess/m4ri-20140914/m4ri/Doxyfile
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/brilliantrussian.c b/simplify/preprocess/m4ri-20140914/m4ri/brilliantrussian.c
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/brilliantrussian.c
rename to simplify/preprocess/m4ri-20140914/m4ri/brilliantrussian.c
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/brilliantrussian.h b/simplify/preprocess/m4ri-20140914/m4ri/brilliantrussian.h
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/brilliantrussian.h
rename to simplify/preprocess/m4ri-20140914/m4ri/brilliantrussian.h
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/brilliantrussian.lo b/simplify/preprocess/m4ri-20140914/m4ri/brilliantrussian.lo
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/brilliantrussian.lo
rename to simplify/preprocess/m4ri-20140914/m4ri/brilliantrussian.lo
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/config.h b/simplify/preprocess/m4ri-20140914/m4ri/config.h
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/config.h
rename to simplify/preprocess/m4ri-20140914/m4ri/config.h
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/config.h.in b/simplify/preprocess/m4ri-20140914/m4ri/config.h.in
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/config.h.in
rename to simplify/preprocess/m4ri-20140914/m4ri/config.h.in
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/debug_dump.c b/simplify/preprocess/m4ri-20140914/m4ri/debug_dump.c
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/debug_dump.c
rename to simplify/preprocess/m4ri-20140914/m4ri/debug_dump.c
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/debug_dump.h b/simplify/preprocess/m4ri-20140914/m4ri/debug_dump.h
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/debug_dump.h
rename to simplify/preprocess/m4ri-20140914/m4ri/debug_dump.h
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/debug_dump.lo b/simplify/preprocess/m4ri-20140914/m4ri/debug_dump.lo
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/debug_dump.lo
rename to simplify/preprocess/m4ri-20140914/m4ri/debug_dump.lo
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/djb.c b/simplify/preprocess/m4ri-20140914/m4ri/djb.c
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/djb.c
rename to simplify/preprocess/m4ri-20140914/m4ri/djb.c
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/djb.h b/simplify/preprocess/m4ri-20140914/m4ri/djb.h
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/djb.h
rename to simplify/preprocess/m4ri-20140914/m4ri/djb.h
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/djb.lo b/simplify/preprocess/m4ri-20140914/m4ri/djb.lo
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/djb.lo
rename to simplify/preprocess/m4ri-20140914/m4ri/djb.lo
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/echelonform.c b/simplify/preprocess/m4ri-20140914/m4ri/echelonform.c
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/echelonform.c
rename to simplify/preprocess/m4ri-20140914/m4ri/echelonform.c
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/echelonform.h b/simplify/preprocess/m4ri-20140914/m4ri/echelonform.h
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/echelonform.h
rename to simplify/preprocess/m4ri-20140914/m4ri/echelonform.h
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/echelonform.lo b/simplify/preprocess/m4ri-20140914/m4ri/echelonform.lo
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/echelonform.lo
rename to simplify/preprocess/m4ri-20140914/m4ri/echelonform.lo
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/graycode.c b/simplify/preprocess/m4ri-20140914/m4ri/graycode.c
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/graycode.c
rename to simplify/preprocess/m4ri-20140914/m4ri/graycode.c
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/graycode.h b/simplify/preprocess/m4ri-20140914/m4ri/graycode.h
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/graycode.h
rename to simplify/preprocess/m4ri-20140914/m4ri/graycode.h
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/graycode.lo b/simplify/preprocess/m4ri-20140914/m4ri/graycode.lo
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/graycode.lo
rename to simplify/preprocess/m4ri-20140914/m4ri/graycode.lo
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/io.c b/simplify/preprocess/m4ri-20140914/m4ri/io.c
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/io.c
rename to simplify/preprocess/m4ri-20140914/m4ri/io.c
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/io.h b/simplify/preprocess/m4ri-20140914/m4ri/io.h
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/io.h
rename to simplify/preprocess/m4ri-20140914/m4ri/io.h
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/io.lo b/simplify/preprocess/m4ri-20140914/m4ri/io.lo
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/io.lo
rename to simplify/preprocess/m4ri-20140914/m4ri/io.lo
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/m4ri.h b/simplify/preprocess/m4ri-20140914/m4ri/m4ri.h
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/m4ri.h
rename to simplify/preprocess/m4ri-20140914/m4ri/m4ri.h
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/m4ri_config.h b/simplify/preprocess/m4ri-20140914/m4ri/m4ri_config.h
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/m4ri_config.h
rename to simplify/preprocess/m4ri-20140914/m4ri/m4ri_config.h
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/m4ri_config.h.in b/simplify/preprocess/m4ri-20140914/m4ri/m4ri_config.h.in
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/m4ri_config.h.in
rename to simplify/preprocess/m4ri-20140914/m4ri/m4ri_config.h.in
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/misc.c b/simplify/preprocess/m4ri-20140914/m4ri/misc.c
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/misc.c
rename to simplify/preprocess/m4ri-20140914/m4ri/misc.c
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/misc.h b/simplify/preprocess/m4ri-20140914/m4ri/misc.h
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/misc.h
rename to simplify/preprocess/m4ri-20140914/m4ri/misc.h
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/misc.lo b/simplify/preprocess/m4ri-20140914/m4ri/misc.lo
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/misc.lo
rename to simplify/preprocess/m4ri-20140914/m4ri/misc.lo
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/mmc.c b/simplify/preprocess/m4ri-20140914/m4ri/mmc.c
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/mmc.c
rename to simplify/preprocess/m4ri-20140914/m4ri/mmc.c
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/mmc.h b/simplify/preprocess/m4ri-20140914/m4ri/mmc.h
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/mmc.h
rename to simplify/preprocess/m4ri-20140914/m4ri/mmc.h
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/mmc.lo b/simplify/preprocess/m4ri-20140914/m4ri/mmc.lo
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/mmc.lo
rename to simplify/preprocess/m4ri-20140914/m4ri/mmc.lo
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/mp.c b/simplify/preprocess/m4ri-20140914/m4ri/mp.c
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/mp.c
rename to simplify/preprocess/m4ri-20140914/m4ri/mp.c
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/mp.h b/simplify/preprocess/m4ri-20140914/m4ri/mp.h
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/mp.h
rename to simplify/preprocess/m4ri-20140914/m4ri/mp.h
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/mp.lo b/simplify/preprocess/m4ri-20140914/m4ri/mp.lo
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/mp.lo
rename to simplify/preprocess/m4ri-20140914/m4ri/mp.lo
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/mzd.c b/simplify/preprocess/m4ri-20140914/m4ri/mzd.c
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/mzd.c
rename to simplify/preprocess/m4ri-20140914/m4ri/mzd.c
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/mzd.h b/simplify/preprocess/m4ri-20140914/m4ri/mzd.h
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/mzd.h
rename to simplify/preprocess/m4ri-20140914/m4ri/mzd.h
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/mzd.lo b/simplify/preprocess/m4ri-20140914/m4ri/mzd.lo
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/mzd.lo
rename to simplify/preprocess/m4ri-20140914/m4ri/mzd.lo
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/mzp.c b/simplify/preprocess/m4ri-20140914/m4ri/mzp.c
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/mzp.c
rename to simplify/preprocess/m4ri-20140914/m4ri/mzp.c
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/mzp.h b/simplify/preprocess/m4ri-20140914/m4ri/mzp.h
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/mzp.h
rename to simplify/preprocess/m4ri-20140914/m4ri/mzp.h
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/mzp.lo b/simplify/preprocess/m4ri-20140914/m4ri/mzp.lo
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/mzp.lo
rename to simplify/preprocess/m4ri-20140914/m4ri/mzp.lo
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/parity.h b/simplify/preprocess/m4ri-20140914/m4ri/parity.h
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/parity.h
rename to simplify/preprocess/m4ri-20140914/m4ri/parity.h
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/ple.c b/simplify/preprocess/m4ri-20140914/m4ri/ple.c
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/ple.c
rename to simplify/preprocess/m4ri-20140914/m4ri/ple.c
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/ple.h b/simplify/preprocess/m4ri-20140914/m4ri/ple.h
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/ple.h
rename to simplify/preprocess/m4ri-20140914/m4ri/ple.h
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/ple.lo b/simplify/preprocess/m4ri-20140914/m4ri/ple.lo
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/ple.lo
rename to simplify/preprocess/m4ri-20140914/m4ri/ple.lo
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/ple_russian.c b/simplify/preprocess/m4ri-20140914/m4ri/ple_russian.c
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/ple_russian.c
rename to simplify/preprocess/m4ri-20140914/m4ri/ple_russian.c
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/ple_russian.h b/simplify/preprocess/m4ri-20140914/m4ri/ple_russian.h
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/ple_russian.h
rename to simplify/preprocess/m4ri-20140914/m4ri/ple_russian.h
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/ple_russian.lo b/simplify/preprocess/m4ri-20140914/m4ri/ple_russian.lo
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/ple_russian.lo
rename to simplify/preprocess/m4ri-20140914/m4ri/ple_russian.lo
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/ple_russian_template.h b/simplify/preprocess/m4ri-20140914/m4ri/ple_russian_template.h
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/ple_russian_template.h
rename to simplify/preprocess/m4ri-20140914/m4ri/ple_russian_template.h
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/solve.c b/simplify/preprocess/m4ri-20140914/m4ri/solve.c
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/solve.c
rename to simplify/preprocess/m4ri-20140914/m4ri/solve.c
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/solve.h b/simplify/preprocess/m4ri-20140914/m4ri/solve.h
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/solve.h
rename to simplify/preprocess/m4ri-20140914/m4ri/solve.h
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/solve.lo b/simplify/preprocess/m4ri-20140914/m4ri/solve.lo
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/solve.lo
rename to simplify/preprocess/m4ri-20140914/m4ri/solve.lo
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/stamp-h1 b/simplify/preprocess/m4ri-20140914/m4ri/stamp-h1
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/stamp-h1
rename to simplify/preprocess/m4ri-20140914/m4ri/stamp-h1
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/strassen.c b/simplify/preprocess/m4ri-20140914/m4ri/strassen.c
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/strassen.c
rename to simplify/preprocess/m4ri-20140914/m4ri/strassen.c
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/strassen.h b/simplify/preprocess/m4ri-20140914/m4ri/strassen.h
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/strassen.h
rename to simplify/preprocess/m4ri-20140914/m4ri/strassen.h
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/strassen.lo b/simplify/preprocess/m4ri-20140914/m4ri/strassen.lo
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/strassen.lo
rename to simplify/preprocess/m4ri-20140914/m4ri/strassen.lo
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/triangular.c b/simplify/preprocess/m4ri-20140914/m4ri/triangular.c
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/triangular.c
rename to simplify/preprocess/m4ri-20140914/m4ri/triangular.c
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/triangular.h b/simplify/preprocess/m4ri-20140914/m4ri/triangular.h
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/triangular.h
rename to simplify/preprocess/m4ri-20140914/m4ri/triangular.h
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/triangular.lo b/simplify/preprocess/m4ri-20140914/m4ri/triangular.lo
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/triangular.lo
rename to simplify/preprocess/m4ri-20140914/m4ri/triangular.lo
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/triangular_russian.c b/simplify/preprocess/m4ri-20140914/m4ri/triangular_russian.c
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/triangular_russian.c
rename to simplify/preprocess/m4ri-20140914/m4ri/triangular_russian.c
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/triangular_russian.h b/simplify/preprocess/m4ri-20140914/m4ri/triangular_russian.h
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/triangular_russian.h
rename to simplify/preprocess/m4ri-20140914/m4ri/triangular_russian.h
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/triangular_russian.lo b/simplify/preprocess/m4ri-20140914/m4ri/triangular_russian.lo
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/triangular_russian.lo
rename to simplify/preprocess/m4ri-20140914/m4ri/triangular_russian.lo
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/xor.h b/simplify/preprocess/m4ri-20140914/m4ri/xor.h
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/xor.h
rename to simplify/preprocess/m4ri-20140914/m4ri/xor.h
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/xor_template.h b/simplify/preprocess/m4ri-20140914/m4ri/xor_template.h
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/m4ri/xor_template.h
rename to simplify/preprocess/m4ri-20140914/m4ri/xor_template.h
diff --git a/src-light-master/preprocess/m4ri-20140914/missing b/simplify/preprocess/m4ri-20140914/missing
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/missing
rename to simplify/preprocess/m4ri-20140914/missing
diff --git a/src-light-master/preprocess/m4ri-20140914/test-driver b/simplify/preprocess/m4ri-20140914/test-driver
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/test-driver
rename to simplify/preprocess/m4ri-20140914/test-driver
diff --git a/src-light-master/preprocess/m4ri-20140914/testsuite/.deps/test_colswap-test_colswap.Po b/simplify/preprocess/m4ri-20140914/testsuite/.deps/test_colswap-test_colswap.Po
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/testsuite/.deps/test_colswap-test_colswap.Po
rename to simplify/preprocess/m4ri-20140914/testsuite/.deps/test_colswap-test_colswap.Po
diff --git a/src-light-master/preprocess/m4ri-20140914/testsuite/.deps/test_elimination-test_elimination.Po b/simplify/preprocess/m4ri-20140914/testsuite/.deps/test_elimination-test_elimination.Po
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/testsuite/.deps/test_elimination-test_elimination.Po
rename to simplify/preprocess/m4ri-20140914/testsuite/.deps/test_elimination-test_elimination.Po
diff --git a/src-light-master/preprocess/m4ri-20140914/testsuite/.deps/test_invert-test_invert.Po b/simplify/preprocess/m4ri-20140914/testsuite/.deps/test_invert-test_invert.Po
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/testsuite/.deps/test_invert-test_invert.Po
rename to simplify/preprocess/m4ri-20140914/testsuite/.deps/test_invert-test_invert.Po
diff --git a/src-light-master/preprocess/m4ri-20140914/testsuite/.deps/test_kernel-test_kernel.Po b/simplify/preprocess/m4ri-20140914/testsuite/.deps/test_kernel-test_kernel.Po
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/testsuite/.deps/test_kernel-test_kernel.Po
rename to simplify/preprocess/m4ri-20140914/testsuite/.deps/test_kernel-test_kernel.Po
diff --git a/src-light-master/preprocess/m4ri-20140914/testsuite/.deps/test_misc-test_misc.Po b/simplify/preprocess/m4ri-20140914/testsuite/.deps/test_misc-test_misc.Po
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/testsuite/.deps/test_misc-test_misc.Po
rename to simplify/preprocess/m4ri-20140914/testsuite/.deps/test_misc-test_misc.Po
diff --git a/src-light-master/preprocess/m4ri-20140914/testsuite/.deps/test_multiplication-test_multiplication.Po b/simplify/preprocess/m4ri-20140914/testsuite/.deps/test_multiplication-test_multiplication.Po
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/testsuite/.deps/test_multiplication-test_multiplication.Po
rename to simplify/preprocess/m4ri-20140914/testsuite/.deps/test_multiplication-test_multiplication.Po
diff --git a/src-light-master/preprocess/m4ri-20140914/testsuite/.deps/test_ple-test_ple.Po b/simplify/preprocess/m4ri-20140914/testsuite/.deps/test_ple-test_ple.Po
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/testsuite/.deps/test_ple-test_ple.Po
rename to simplify/preprocess/m4ri-20140914/testsuite/.deps/test_ple-test_ple.Po
diff --git a/src-light-master/preprocess/m4ri-20140914/testsuite/.deps/test_random-test_random.Po b/simplify/preprocess/m4ri-20140914/testsuite/.deps/test_random-test_random.Po
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/testsuite/.deps/test_random-test_random.Po
rename to simplify/preprocess/m4ri-20140914/testsuite/.deps/test_random-test_random.Po
diff --git a/src-light-master/preprocess/m4ri-20140914/testsuite/.deps/test_smallops-test_smallops.Po b/simplify/preprocess/m4ri-20140914/testsuite/.deps/test_smallops-test_smallops.Po
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/testsuite/.deps/test_smallops-test_smallops.Po
rename to simplify/preprocess/m4ri-20140914/testsuite/.deps/test_smallops-test_smallops.Po
diff --git a/src-light-master/preprocess/m4ri-20140914/testsuite/.deps/test_smallops-testing.Po b/simplify/preprocess/m4ri-20140914/testsuite/.deps/test_smallops-testing.Po
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/testsuite/.deps/test_smallops-testing.Po
rename to simplify/preprocess/m4ri-20140914/testsuite/.deps/test_smallops-testing.Po
diff --git a/src-light-master/preprocess/m4ri-20140914/testsuite/.deps/test_solve-test_solve.Po b/simplify/preprocess/m4ri-20140914/testsuite/.deps/test_solve-test_solve.Po
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/testsuite/.deps/test_solve-test_solve.Po
rename to simplify/preprocess/m4ri-20140914/testsuite/.deps/test_solve-test_solve.Po
diff --git a/src-light-master/preprocess/m4ri-20140914/testsuite/.deps/test_transpose-test_transpose.Po b/simplify/preprocess/m4ri-20140914/testsuite/.deps/test_transpose-test_transpose.Po
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/testsuite/.deps/test_transpose-test_transpose.Po
rename to simplify/preprocess/m4ri-20140914/testsuite/.deps/test_transpose-test_transpose.Po
diff --git a/src-light-master/preprocess/m4ri-20140914/testsuite/.deps/test_trsm-test_trsm.Po b/simplify/preprocess/m4ri-20140914/testsuite/.deps/test_trsm-test_trsm.Po
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/testsuite/.deps/test_trsm-test_trsm.Po
rename to simplify/preprocess/m4ri-20140914/testsuite/.deps/test_trsm-test_trsm.Po
diff --git a/src-light-master/preprocess/m4ri-20140914/testsuite/Makefile b/simplify/preprocess/m4ri-20140914/testsuite/Makefile
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/testsuite/Makefile
rename to simplify/preprocess/m4ri-20140914/testsuite/Makefile
diff --git a/src-light-master/preprocess/m4ri-20140914/testsuite/Makefile.in b/simplify/preprocess/m4ri-20140914/testsuite/Makefile.in
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/testsuite/Makefile.in
rename to simplify/preprocess/m4ri-20140914/testsuite/Makefile.in
diff --git a/src-light-master/preprocess/m4ri-20140914/testsuite/test_colswap.c b/simplify/preprocess/m4ri-20140914/testsuite/test_colswap.c
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/testsuite/test_colswap.c
rename to simplify/preprocess/m4ri-20140914/testsuite/test_colswap.c
diff --git a/src-light-master/preprocess/m4ri-20140914/testsuite/test_elimination.c b/simplify/preprocess/m4ri-20140914/testsuite/test_elimination.c
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/testsuite/test_elimination.c
rename to simplify/preprocess/m4ri-20140914/testsuite/test_elimination.c
diff --git a/src-light-master/preprocess/m4ri-20140914/testsuite/test_invert.c b/simplify/preprocess/m4ri-20140914/testsuite/test_invert.c
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/testsuite/test_invert.c
rename to simplify/preprocess/m4ri-20140914/testsuite/test_invert.c
diff --git a/src-light-master/preprocess/m4ri-20140914/testsuite/test_kernel.c b/simplify/preprocess/m4ri-20140914/testsuite/test_kernel.c
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/testsuite/test_kernel.c
rename to simplify/preprocess/m4ri-20140914/testsuite/test_kernel.c
diff --git a/src-light-master/preprocess/m4ri-20140914/testsuite/test_misc.c b/simplify/preprocess/m4ri-20140914/testsuite/test_misc.c
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/testsuite/test_misc.c
rename to simplify/preprocess/m4ri-20140914/testsuite/test_misc.c
diff --git a/src-light-master/preprocess/m4ri-20140914/testsuite/test_multiplication.c b/simplify/preprocess/m4ri-20140914/testsuite/test_multiplication.c
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/testsuite/test_multiplication.c
rename to simplify/preprocess/m4ri-20140914/testsuite/test_multiplication.c
diff --git a/src-light-master/preprocess/m4ri-20140914/testsuite/test_ple.c b/simplify/preprocess/m4ri-20140914/testsuite/test_ple.c
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/testsuite/test_ple.c
rename to simplify/preprocess/m4ri-20140914/testsuite/test_ple.c
diff --git a/src-light-master/preprocess/m4ri-20140914/testsuite/test_random.c b/simplify/preprocess/m4ri-20140914/testsuite/test_random.c
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/testsuite/test_random.c
rename to simplify/preprocess/m4ri-20140914/testsuite/test_random.c
diff --git a/src-light-master/preprocess/m4ri-20140914/testsuite/test_smallops.c b/simplify/preprocess/m4ri-20140914/testsuite/test_smallops.c
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/testsuite/test_smallops.c
rename to simplify/preprocess/m4ri-20140914/testsuite/test_smallops.c
diff --git a/src-light-master/preprocess/m4ri-20140914/testsuite/test_solve.c b/simplify/preprocess/m4ri-20140914/testsuite/test_solve.c
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/testsuite/test_solve.c
rename to simplify/preprocess/m4ri-20140914/testsuite/test_solve.c
diff --git a/src-light-master/preprocess/m4ri-20140914/testsuite/test_transpose.c b/simplify/preprocess/m4ri-20140914/testsuite/test_transpose.c
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/testsuite/test_transpose.c
rename to simplify/preprocess/m4ri-20140914/testsuite/test_transpose.c
diff --git a/src-light-master/preprocess/m4ri-20140914/testsuite/test_trsm.c b/simplify/preprocess/m4ri-20140914/testsuite/test_trsm.c
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/testsuite/test_trsm.c
rename to simplify/preprocess/m4ri-20140914/testsuite/test_trsm.c
diff --git a/src-light-master/preprocess/m4ri-20140914/testsuite/testing.c b/simplify/preprocess/m4ri-20140914/testsuite/testing.c
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/testsuite/testing.c
rename to simplify/preprocess/m4ri-20140914/testsuite/testing.c
diff --git a/src-light-master/preprocess/m4ri-20140914/testsuite/testing.h b/simplify/preprocess/m4ri-20140914/testsuite/testing.h
similarity index 100%
rename from src-light-master/preprocess/m4ri-20140914/testsuite/testing.h
rename to simplify/preprocess/m4ri-20140914/testsuite/testing.h
diff --git a/src-light-master/preprocess/preprocess.cpp b/simplify/preprocess/preprocess.cpp
similarity index 100%
rename from src-light-master/preprocess/preprocess.cpp
rename to simplify/preprocess/preprocess.cpp
diff --git a/src-light-master/preprocess/preprocess.hpp b/simplify/preprocess/preprocess.hpp
similarity index 100%
rename from src-light-master/preprocess/preprocess.hpp
rename to simplify/preprocess/preprocess.hpp
diff --git a/src-light-master/preprocess/propagation.cpp b/simplify/preprocess/propagation.cpp
similarity index 100%
rename from src-light-master/preprocess/propagation.cpp
rename to simplify/preprocess/propagation.cpp
diff --git a/src-light-master/preprocess/resolution.cpp b/simplify/preprocess/resolution.cpp
similarity index 100%
rename from src-light-master/preprocess/resolution.cpp
rename to simplify/preprocess/resolution.cpp
diff --git a/src-light-master/utils/check-sat b/simplify/utils/check-sat
similarity index 100%
rename from src-light-master/utils/check-sat
rename to simplify/utils/check-sat
diff --git a/src-light-master/utils/cmdline.h b/simplify/utils/cmdline.h
similarity index 100%
rename from src-light-master/utils/cmdline.h
rename to simplify/utils/cmdline.h
diff --git a/src-light-master/utils/hashmap.cpp b/simplify/utils/hashmap.cpp
similarity index 100%
rename from src-light-master/utils/hashmap.cpp
rename to simplify/utils/hashmap.cpp
diff --git a/src-light-master/utils/hashmap.hpp b/simplify/utils/hashmap.hpp
similarity index 100%
rename from src-light-master/utils/hashmap.hpp
rename to simplify/utils/hashmap.hpp
diff --git a/src-light-master/utils/parse.cpp b/simplify/utils/parse.cpp
similarity index 100%
rename from src-light-master/utils/parse.cpp
rename to simplify/utils/parse.cpp
diff --git a/src-light-master/utils/parse.hpp b/simplify/utils/parse.hpp
similarity index 100%
rename from src-light-master/utils/parse.hpp
rename to simplify/utils/parse.hpp
diff --git a/src-light-master/utils/vec.hpp b/simplify/utils/vec.hpp
similarity index 100%
rename from src-light-master/utils/vec.hpp
rename to simplify/utils/vec.hpp
diff --git a/src-light-master/preprocess/binary.o b/src-light-master/preprocess/binary.o
deleted file mode 100644
index eb7a9e6..0000000
Binary files a/src-light-master/preprocess/binary.o and /dev/null differ
diff --git a/src-light-master/preprocess/card.o b/src-light-master/preprocess/card.o
deleted file mode 100644
index 811a98f..0000000
Binary files a/src-light-master/preprocess/card.o and /dev/null differ
diff --git a/src-light-master/preprocess/gauss.o b/src-light-master/preprocess/gauss.o
deleted file mode 100644
index 10471f3..0000000
Binary files a/src-light-master/preprocess/gauss.o and /dev/null differ
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/.libs/brilliantrussian.o b/src-light-master/preprocess/m4ri-20140914/m4ri/.libs/brilliantrussian.o
deleted file mode 100644
index ba6f131..0000000
Binary files a/src-light-master/preprocess/m4ri-20140914/m4ri/.libs/brilliantrussian.o and /dev/null differ
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/.libs/debug_dump.o b/src-light-master/preprocess/m4ri-20140914/m4ri/.libs/debug_dump.o
deleted file mode 100644
index 033af75..0000000
Binary files a/src-light-master/preprocess/m4ri-20140914/m4ri/.libs/debug_dump.o and /dev/null differ
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/.libs/djb.o b/src-light-master/preprocess/m4ri-20140914/m4ri/.libs/djb.o
deleted file mode 100644
index e13b944..0000000
Binary files a/src-light-master/preprocess/m4ri-20140914/m4ri/.libs/djb.o and /dev/null differ
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/.libs/echelonform.o b/src-light-master/preprocess/m4ri-20140914/m4ri/.libs/echelonform.o
deleted file mode 100644
index 151475c..0000000
Binary files a/src-light-master/preprocess/m4ri-20140914/m4ri/.libs/echelonform.o and /dev/null differ
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/.libs/graycode.o b/src-light-master/preprocess/m4ri-20140914/m4ri/.libs/graycode.o
deleted file mode 100644
index 3e4d9d4..0000000
Binary files a/src-light-master/preprocess/m4ri-20140914/m4ri/.libs/graycode.o and /dev/null differ
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/.libs/io.o b/src-light-master/preprocess/m4ri-20140914/m4ri/.libs/io.o
deleted file mode 100644
index fd2a989..0000000
Binary files a/src-light-master/preprocess/m4ri-20140914/m4ri/.libs/io.o and /dev/null differ
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/.libs/misc.o b/src-light-master/preprocess/m4ri-20140914/m4ri/.libs/misc.o
deleted file mode 100644
index 10b4b96..0000000
Binary files a/src-light-master/preprocess/m4ri-20140914/m4ri/.libs/misc.o and /dev/null differ
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/.libs/mmc.o b/src-light-master/preprocess/m4ri-20140914/m4ri/.libs/mmc.o
deleted file mode 100644
index 7c8ef77..0000000
Binary files a/src-light-master/preprocess/m4ri-20140914/m4ri/.libs/mmc.o and /dev/null differ
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/.libs/mp.o b/src-light-master/preprocess/m4ri-20140914/m4ri/.libs/mp.o
deleted file mode 100644
index 3009fad..0000000
Binary files a/src-light-master/preprocess/m4ri-20140914/m4ri/.libs/mp.o and /dev/null differ
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/.libs/mzd.o b/src-light-master/preprocess/m4ri-20140914/m4ri/.libs/mzd.o
deleted file mode 100644
index e1935c8..0000000
Binary files a/src-light-master/preprocess/m4ri-20140914/m4ri/.libs/mzd.o and /dev/null differ
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/.libs/mzp.o b/src-light-master/preprocess/m4ri-20140914/m4ri/.libs/mzp.o
deleted file mode 100644
index d53fae7..0000000
Binary files a/src-light-master/preprocess/m4ri-20140914/m4ri/.libs/mzp.o and /dev/null differ
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/.libs/ple.o b/src-light-master/preprocess/m4ri-20140914/m4ri/.libs/ple.o
deleted file mode 100644
index dadf50c..0000000
Binary files a/src-light-master/preprocess/m4ri-20140914/m4ri/.libs/ple.o and /dev/null differ
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/.libs/ple_russian.o b/src-light-master/preprocess/m4ri-20140914/m4ri/.libs/ple_russian.o
deleted file mode 100644
index 06864f3..0000000
Binary files a/src-light-master/preprocess/m4ri-20140914/m4ri/.libs/ple_russian.o and /dev/null differ
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/.libs/solve.o b/src-light-master/preprocess/m4ri-20140914/m4ri/.libs/solve.o
deleted file mode 100644
index 508bba4..0000000
Binary files a/src-light-master/preprocess/m4ri-20140914/m4ri/.libs/solve.o and /dev/null differ
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/.libs/strassen.o b/src-light-master/preprocess/m4ri-20140914/m4ri/.libs/strassen.o
deleted file mode 100644
index a61df00..0000000
Binary files a/src-light-master/preprocess/m4ri-20140914/m4ri/.libs/strassen.o and /dev/null differ
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/.libs/triangular.o b/src-light-master/preprocess/m4ri-20140914/m4ri/.libs/triangular.o
deleted file mode 100644
index 7233260..0000000
Binary files a/src-light-master/preprocess/m4ri-20140914/m4ri/.libs/triangular.o and /dev/null differ
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/.libs/triangular_russian.o b/src-light-master/preprocess/m4ri-20140914/m4ri/.libs/triangular_russian.o
deleted file mode 100644
index 8da2829..0000000
Binary files a/src-light-master/preprocess/m4ri-20140914/m4ri/.libs/triangular_russian.o and /dev/null differ
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/brilliantrussian.o b/src-light-master/preprocess/m4ri-20140914/m4ri/brilliantrussian.o
deleted file mode 100644
index afcb646..0000000
Binary files a/src-light-master/preprocess/m4ri-20140914/m4ri/brilliantrussian.o and /dev/null differ
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/debug_dump.o b/src-light-master/preprocess/m4ri-20140914/m4ri/debug_dump.o
deleted file mode 100644
index cab6ef3..0000000
Binary files a/src-light-master/preprocess/m4ri-20140914/m4ri/debug_dump.o and /dev/null differ
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/djb.o b/src-light-master/preprocess/m4ri-20140914/m4ri/djb.o
deleted file mode 100644
index af16cda..0000000
Binary files a/src-light-master/preprocess/m4ri-20140914/m4ri/djb.o and /dev/null differ
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/echelonform.o b/src-light-master/preprocess/m4ri-20140914/m4ri/echelonform.o
deleted file mode 100644
index a6b881d..0000000
Binary files a/src-light-master/preprocess/m4ri-20140914/m4ri/echelonform.o and /dev/null differ
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/graycode.o b/src-light-master/preprocess/m4ri-20140914/m4ri/graycode.o
deleted file mode 100644
index 22668fd..0000000
Binary files a/src-light-master/preprocess/m4ri-20140914/m4ri/graycode.o and /dev/null differ
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/io.o b/src-light-master/preprocess/m4ri-20140914/m4ri/io.o
deleted file mode 100644
index 59746e3..0000000
Binary files a/src-light-master/preprocess/m4ri-20140914/m4ri/io.o and /dev/null differ
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/misc.o b/src-light-master/preprocess/m4ri-20140914/m4ri/misc.o
deleted file mode 100644
index 1d3ef59..0000000
Binary files a/src-light-master/preprocess/m4ri-20140914/m4ri/misc.o and /dev/null differ
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/mmc.o b/src-light-master/preprocess/m4ri-20140914/m4ri/mmc.o
deleted file mode 100644
index b9b4888..0000000
Binary files a/src-light-master/preprocess/m4ri-20140914/m4ri/mmc.o and /dev/null differ
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/mp.o b/src-light-master/preprocess/m4ri-20140914/m4ri/mp.o
deleted file mode 100644
index a2b4342..0000000
Binary files a/src-light-master/preprocess/m4ri-20140914/m4ri/mp.o and /dev/null differ
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/mzd.o b/src-light-master/preprocess/m4ri-20140914/m4ri/mzd.o
deleted file mode 100644
index 4cc197b..0000000
Binary files a/src-light-master/preprocess/m4ri-20140914/m4ri/mzd.o and /dev/null differ
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/mzp.o b/src-light-master/preprocess/m4ri-20140914/m4ri/mzp.o
deleted file mode 100644
index dbca5d2..0000000
Binary files a/src-light-master/preprocess/m4ri-20140914/m4ri/mzp.o and /dev/null differ
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/ple.o b/src-light-master/preprocess/m4ri-20140914/m4ri/ple.o
deleted file mode 100644
index b363805..0000000
Binary files a/src-light-master/preprocess/m4ri-20140914/m4ri/ple.o and /dev/null differ
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/ple_russian.o b/src-light-master/preprocess/m4ri-20140914/m4ri/ple_russian.o
deleted file mode 100644
index 3c91754..0000000
Binary files a/src-light-master/preprocess/m4ri-20140914/m4ri/ple_russian.o and /dev/null differ
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/solve.o b/src-light-master/preprocess/m4ri-20140914/m4ri/solve.o
deleted file mode 100644
index c274bad..0000000
Binary files a/src-light-master/preprocess/m4ri-20140914/m4ri/solve.o and /dev/null differ
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/strassen.o b/src-light-master/preprocess/m4ri-20140914/m4ri/strassen.o
deleted file mode 100644
index 6f39c78..0000000
Binary files a/src-light-master/preprocess/m4ri-20140914/m4ri/strassen.o and /dev/null differ
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/triangular.o b/src-light-master/preprocess/m4ri-20140914/m4ri/triangular.o
deleted file mode 100644
index b9b89df..0000000
Binary files a/src-light-master/preprocess/m4ri-20140914/m4ri/triangular.o and /dev/null differ
diff --git a/src-light-master/preprocess/m4ri-20140914/m4ri/triangular_russian.o b/src-light-master/preprocess/m4ri-20140914/m4ri/triangular_russian.o
deleted file mode 100644
index 29064c0..0000000
Binary files a/src-light-master/preprocess/m4ri-20140914/m4ri/triangular_russian.o and /dev/null differ
diff --git a/src-light-master/preprocess/preprocess.o b/src-light-master/preprocess/preprocess.o
deleted file mode 100644
index 2ff0731..0000000
Binary files a/src-light-master/preprocess/preprocess.o and /dev/null differ
diff --git a/src-light-master/preprocess/propagation.o b/src-light-master/preprocess/propagation.o
deleted file mode 100644
index f5cccfd..0000000
Binary files a/src-light-master/preprocess/propagation.o and /dev/null differ
diff --git a/src-light-master/preprocess/resolution.o b/src-light-master/preprocess/resolution.o
deleted file mode 100644
index 18e32c6..0000000
Binary files a/src-light-master/preprocess/resolution.o and /dev/null differ
diff --git a/src/distributed/heartbeat.cpp b/src/distributed/heartbeat.cpp
new file mode 100644
index 0000000..5b00144
--- /dev/null
+++ b/src/distributed/heartbeat.cpp
@@ -0,0 +1,98 @@
+
+
+#include "heartbeat.h"
+
+HeartBeat::HeartBeat(int num_procs) {
+    this->num_procs = num_procs;
+    this->online = new int[num_procs];
+    for(int i=0; i<num_procs; i++) {
+        this->online[i] = 1;
+    }
+    this->last_send_time = new time_t[num_procs];
+    for(int i=0; i<num_procs; i++) {
+        this->last_send_time[i] = 0;
+    }
+    this->requests = new MPI_Request[num_procs];
+    this->send_requests = new MPI_Request[num_procs];
+    for(int i=1; i<num_procs; i++) {
+        MPI_Irecv(&last_send_time[i], 1, MPI_INT, i, 0, MPI_COMM_WORLD, &requests[i]);
+        int buf[2];
+        buf[0] = next_online(i);
+        buf[1] = last_online(i);
+        MPI_Isend(buf, 2, MPI_INT, i, 0, MPI_COMM_WORLD, &send_requests[i]);
+    }
+    auto t = time(NULL);
+}
+
+HeartBeat::~HeartBeat() {
+    delete []this->online;
+    delete []this->last_send_time;
+    delete []this->requests;
+}
+
+void HeartBeat::update() {
+    for(int i=1; i<num_procs; i++) {
+        int flag;
+        while(MPI_Test(&requests[i], &flag, MPI_STATUS_IGNORE) == MPI_SUCCESS && flag == 1) {
+            printf("[leader] receive headbeat from: %d - time: %d\n", i, time(0) - last_send_time[i]);
+            MPI_Irecv(&last_send_time[i], 1, MPI_INT, i, 0, MPI_COMM_WORLD, &requests[i]);
+        }
+    }
+
+    time_t now = time(NULL);
+
+    for(int i=1; i<num_procs; i++) {
+        if(now - last_send_time[i] > 5) {
+            if(online[i]) printf("[leader] ERROR: worker %d offline\n", i);
+            online[i] = 0;
+        } else {
+            if(!online[i]) printf("[leader] RECONNECT: worker %d online\n", i);
+            online[i] = 1;
+        }
+    }
+
+    for(int i=1; i<num_procs; i++) {
+        int flag;
+        if(MPI_Test(&requests[i], &flag, MPI_STATUS_IGNORE) == MPI_SUCCESS && flag == 1) {
+            int buf[2];
+            buf[0] = next_online(i);
+            buf[1] = last_online(i);
+            MPI_Isend(buf, 2, MPI_INT, i, 0, MPI_COMM_WORLD, &send_requests[i]);
+        }
+    }
+
+}
+
+void HeartBeat::waiting_all() {
+    MPI_Waitall(num_procs-1, requests+1, MPI_STATUS_IGNORE);
+    for(int i=1; i<num_procs; i++) {
+        int flag;
+        if(MPI_Test(&requests[i], &flag, MPI_STATUS_IGNORE) == MPI_SUCCESS && flag == 1) {
+            int buf[2];
+            buf[0] = next_online(i);
+            buf[1] = last_online(i);
+
+            printf("buf: %d %d\n", buf[0], buf[1]);
+            MPI_Isend(buf, 2, MPI_INT, i, 0, MPI_COMM_WORLD, &send_requests[i]);
+        }
+    }
+
+}
+
+int HeartBeat::is_online(int p) {
+    return online[p];
+}
+
+int HeartBeat::next_online(int p) {
+    do {
+        p = (p + 1) % (num_procs - 1);
+    } while(!is_online(p));
+    return p + 1;
+}
+
+int HeartBeat::last_online(int p) {
+    do {
+        p = (p - 1 + num_procs - 1) % (num_procs - 1);
+    } while(!is_online(p));
+    return p + 1;
+}
\ No newline at end of file
diff --git a/src/distributed/heartbeat.h b/src/distributed/heartbeat.h
new file mode 100644
index 0000000..abe7878
--- /dev/null
+++ b/src/distributed/heartbeat.h
@@ -0,0 +1,18 @@
+#include <mpi.h>
+
+class HeartBeat {
+public:
+    HeartBeat(int num_procs);
+    ~HeartBeat();
+    int is_online(int p);
+    int next_online(int p);
+    int last_online(int p);
+    void update();
+    void waiting_all();
+private:
+    int num_procs;
+    int *online;
+    time_t *last_send_time;
+    MPI_Request* requests;
+    MPI_Request* send_requests;
+};
\ No newline at end of file
diff --git a/src/distributed/leader.hpp b/src/distributed/leader.hpp
new file mode 100644
index 0000000..28a5b85
--- /dev/null
+++ b/src/distributed/leader.hpp
@@ -0,0 +1,53 @@
+#pragma once
+
+#include <chrono>
+#include <thread>
+#include <fstream>
+#include <mpi.h>
+
+#include "../light.hpp"
+#include "../utils/cmdline.h"
+#include "../paras.hpp"
+#include "heartbeat.h"
+
+
+void do_simplify(light* S, std::stringstream &ss) {
+    auto pre = new preprocess();
+
+    char *filename = const_cast<char*>(S->opt->instance.c_str());
+    pre->do_preprocess(filename);
+
+    ss << "p cnf " << pre->vars << " " << pre->clause.size() << std::endl;
+    for (int i = 1; i <= pre->clauses; i++) {
+        int l = pre->clause[i].size();
+        for (int j = 0; j < l; j++)
+            ss << pre->clause[i][j] << " ";
+        ss << "0" << std::endl;
+    }
+
+}
+
+
+void leader_main(light* S, int num_procs, int rank) {
+
+    printf("[leader] reading and do simplify ...\n");
+
+    // read file
+    std::stringstream ss;
+    do_simplify(S, ss);
+    const auto& str_ref = ss.str();
+    const char* cstr = str_ref.c_str();
+
+    printf("[leader] hand out simplified cnf ...\n");
+
+    HeartBeat *hb = new HeartBeat(num_procs); 
+
+    printf("[leader] waiting for connection...\n");
+    hb->waiting_all();
+
+    for(int i=1; i<=10; i++) {
+        printf("[leader] check: %d\n", i);
+        hb->update();
+        std::this_thread::sleep_for(std::chrono::seconds(1));
+    }
+}
\ No newline at end of file
diff --git a/src/distributed/worker.hpp b/src/distributed/worker.hpp
new file mode 100644
index 0000000..7a79b5e
--- /dev/null
+++ b/src/distributed/worker.hpp
@@ -0,0 +1,38 @@
+#include <chrono>
+#include <thread>
+#include <fstream>
+#include <ctime>
+#include <mpi.h>
+
+#include "../light.hpp"
+#include "../utils/cmdline.h"
+#include "../paras.hpp"
+
+void worker_main(light* S, int num_procs, int rank) {
+
+    printf("[worker] i'm worker\n");
+
+    std::this_thread::sleep_for(std::chrono::seconds(1));
+
+    time_t now = time(NULL);
+    MPI_Send(&now, 1, MPI_INT, 0, 0, MPI_COMM_WORLD);
+
+    int buf[2];
+    MPI_Recv(buf, 2, MPI_INT, 0, 0, MPI_COMM_WORLD, MPI_STATUS_IGNORE);
+    int next = buf[0], last = buf[1];
+
+    printf("my %d next: %d last: %d\n", rank, next, last);
+
+    int res = S->run();
+    if (res == 10) {
+        printf("s SATISFIABLE\n");
+        // print_model(model);
+    }
+    else if (res == 20) {
+        printf("s UNSATISFIABLE\n");
+    }
+    else {
+        printf("s UNKNOWN\n");
+    }
+    delete(S);
+}
\ No newline at end of file
diff --git a/src/main.cpp b/src/main.cpp
index e33d858..bd03df5 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -8,33 +8,22 @@
 #include "utils/cmdline.h"
 #include "paras.hpp"
 
+#include "distributed/leader.hpp"
+#include "distributed/worker.hpp"
+
 int main(int argc, char **argv) {
 
     int num_procs, rank;
-
     MPI_Init(&argc, &argv);
     MPI_Comm_size(MPI_COMM_WORLD, &num_procs);
     MPI_Comm_rank(MPI_COMM_WORLD, &rank);
 
-    printf("num_procs: %d, rank: %d\n", num_procs, rank);
-
-    return 0;
-
     light* S = new light();
     S->arg_parse(argc, argv);
 
-    int res = S->run();
-    if (res == 10) {
-        printf("s SATISFIABLE\n");
-        // print_model(model);
-    }
-    else if (res == 20) {
-        printf("s UNSATISFIABLE\n");
-    }
-    else {
-        printf("s UNKNOWN\n");
-    }
-    delete(S);
+    // leader
+    if(rank == 0) leader_main(S, num_procs, rank);
+    else worker_main(S, num_procs, rank);
 
     MPI_Finalize();
 
diff --git a/src/paras.hpp b/src/paras.hpp
index abf07a9..da8eeb9 100644
--- a/src/paras.hpp
+++ b/src/paras.hpp
@@ -26,7 +26,7 @@
 #define STR_PARAS \
     STR_PARA( config     , '\0'  ,  false   , "" , "Config file")  \
     STR_PARA( instance   , 'i'   ,  true    , "" , "CNF format instance")
-
+    
 struct paras 
 {
 #define PARA(N, T, S, M, D, L, H, C) \
diff --git a/src/solve.cpp b/src/solve.cpp
index 5c7edc4..a9bee9a 100644
--- a/src/solve.cpp
+++ b/src/solve.cpp
@@ -6,6 +6,7 @@
 #include <chrono>
 #include <algorithm>
 #include <mutex>
+#include "mpi.h"
 auto clk_st = std::chrono::high_resolution_clock::now();
 char* worker_sign = "";
 
@@ -147,7 +148,11 @@ int light::solve() {
     int pre_time = std::chrono::duration_cast<std::chrono::seconds>(clk_sol_st - clk_st).count();
     int sol_thd = 0, intv_time = OPT(reset_time);
     while (!terminated) {
-        usleep(100000);        
+        usleep(500000);
+
+        time_t now = time(NULL);
+        MPI_Send(&now, 1, MPI_INT, 0, 0, MPI_COMM_WORLD);
+
         auto clk_now = std::chrono::high_resolution_clock::now();
         int solve_time = std::chrono::duration_cast<std::chrono::seconds>(clk_now - clk_st).count();
         if (solve_time >= OPT(times)) {