diff --git a/.export.sh.swp b/.export.sh.swp
new file mode 100644
index 0000000000000000000000000000000000000000..945b1e361770b3cc3bd6ba068d9e9996727fd8d6
Binary files /dev/null and b/.export.sh.swp differ
diff --git a/export.sh b/export.sh
index 218b4d4466dd2e1d3c9bf661953078cfdf5d7ae2..9798966432b23ae8ea1575d4dc2a7358b335606b 100644
--- a/export.sh
+++ b/export.sh
@@ -1,3 +1,8 @@
 #!/bin/bash
 
-export LD_LIBRARY_PATH=$(pwd)
+## Unsable script for now
+## LD_LIBRARY_PATH must contains dir's path to libsandbox.so
+## Do the cmd in your terminal
+
+REALTIVE_PATH_TO_SO=../ar_sandbox_lib && \
+export LD_LIBRARY_PATH=$(pwd)/$REALTIVE_PATH_TO_SO
diff --git a/includes/camera.h b/includes/camera.h
index 2e29fa12a52082d5b61424b169331449777f199c..65ed09ebdde953ec0814d77978868a6fbad5eea2 100644
--- a/includes/camera.h
+++ b/includes/camera.h
@@ -10,9 +10,9 @@ class Camera
 private:
     //constants in mm
     //const float scale = rs2_get_depth_scale(sensor, NULL);
-    static const int maxHeightSand = 400;
-    static const int maxZ = 1120;
-    static const int minZ = maxZ - maxHeightSand;
+    //static const int maxHeightSand = 400;
+    //static const int maxZ = 1120;
+    //static const int minZ = maxZ - maxHeightSand;
 
     rs2::spatial_filter spatFilter;
     rs2::temporal_filter tempFilter;
diff --git a/src/Makefile b/src/Makefile
index 6347fd1e81572ba4b74bd1c0e7f61431d7d1efe2..7a036077a6d6afcf7fbc49725b341e1a46b18156 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -4,7 +4,7 @@ SRCS:=$(wildcard *.cpp)
 OBJS:=$(SRCS:%.cpp=%.o)
 
 all:
-	$(MAKE) -C lib
+	$(MAKE) -C core
 	$(MAKE) build -C .
 
 build: $(OBJS)
@@ -14,4 +14,4 @@ build: $(OBJS)
 
 clean:
 	-rm -f *.o
-	$(MAKE) clean -C lib
+	$(MAKE) clean -C core
diff --git a/src/lib/Makefile b/src/core/Makefile
similarity index 100%
rename from src/lib/Makefile
rename to src/core/Makefile
diff --git a/src/lib/components/Makefile b/src/core/components/Makefile
similarity index 100%
rename from src/lib/components/Makefile
rename to src/core/components/Makefile
diff --git a/src/lib/components/beamer.cpp b/src/core/components/beamer.cpp
similarity index 100%
rename from src/lib/components/beamer.cpp
rename to src/core/components/beamer.cpp
diff --git a/src/lib/components/calibrate.cpp b/src/core/components/calibrate.cpp
similarity index 100%
rename from src/lib/components/calibrate.cpp
rename to src/core/components/calibrate.cpp
diff --git a/src/lib/components/camera.cpp b/src/core/components/camera.cpp
similarity index 100%
rename from src/lib/components/camera.cpp
rename to src/core/components/camera.cpp
diff --git a/src/lib/controller.cpp b/src/core/controller.cpp
similarity index 100%
rename from src/lib/controller.cpp
rename to src/core/controller.cpp
diff --git a/src/lib/tools/Makefile b/src/core/tools/Makefile
similarity index 100%
rename from src/lib/tools/Makefile
rename to src/core/tools/Makefile
diff --git a/src/lib/tools/borderedit.cpp b/src/core/tools/borderedit.cpp
similarity index 100%
rename from src/lib/tools/borderedit.cpp
rename to src/core/tools/borderedit.cpp
diff --git a/src/lib/tools/borderfinder.cpp b/src/core/tools/borderfinder.cpp
similarity index 100%
rename from src/lib/tools/borderfinder.cpp
rename to src/core/tools/borderfinder.cpp
diff --git a/src/lib/tools/log.c b/src/core/tools/log.c
similarity index 100%
rename from src/lib/tools/log.c
rename to src/core/tools/log.c