diff --git a/deploy/clever.service b/builder_scripts/assets/clever.service
similarity index 77%
rename from deploy/clever.service
rename to builder_scripts/assets/clever.service
index 282ab0af..ed6374fe 100644
--- a/deploy/clever.service
+++ b/builder_scripts/assets/clever.service
@@ -4,7 +4,7 @@ Requires=roscore.service
 After=roscore.service
 
 [Service]
-EnvironmentFile=/home/pi/catkin_ws/src/clever/deploy/roscore.env
+EnvironmentFile=/root/roscore.env
 ExecStart=/opt/ros/kinetic/bin/roslaunch clever clever.launch --wait
 Restart=on-abort
 
diff --git a/deploy/generate_ros_lib b/builder_scripts/assets/generate_ros_lib
similarity index 76%
rename from deploy/generate_ros_lib
rename to builder_scripts/assets/generate_ros_lib
index b72c5602..c821ff42 100644
--- a/deploy/generate_ros_lib
+++ b/builder_scripts/assets/generate_ros_lib
@@ -1,9 +1,14 @@
 #!/usr/bin/env bash
 
+#
+# @okalachev Oleg Kalachev
+# @urpylka Artem Smirnov
+#
+
 # This script generates ros_lib library for Arduino for using with rosseial_arduino:
 # http://wiki.ros.org/rosserial_arduino/Tutorials
 # https://copterexpress.gitbooks.io/clever/content/docs/arduino.html
 
-rm -rf ros_lib
+rm -rf ros_lib clever_arudino.tar.gz
 rosrun rosserial_arduino make_libraries.py .
 tar czf clever_arudino.tar.gz ros_lib
diff --git a/builder_scripts/hardware_setup.sh b/builder_scripts/assets/hardware_setup.sh
similarity index 100%
rename from builder_scripts/hardware_setup.sh
rename to builder_scripts/assets/hardware_setup.sh
diff --git a/builder_scripts/init_rpi.sh b/builder_scripts/assets/init_rpi.sh
similarity index 100%
rename from builder_scripts/init_rpi.sh
rename to builder_scripts/assets/init_rpi.sh
diff --git a/builder_scripts/kinetic-ros-clever.rosinstall b/builder_scripts/assets/kinetic-ros-clever.rosinstall
similarity index 100%
rename from builder_scripts/kinetic-ros-clever.rosinstall
rename to builder_scripts/assets/kinetic-ros-clever.rosinstall
diff --git a/builder_scripts/kinetic-rosdep-clever.yaml b/builder_scripts/assets/kinetic-rosdep-clever.yaml
similarity index 100%
rename from builder_scripts/kinetic-rosdep-clever.yaml
rename to builder_scripts/assets/kinetic-rosdep-clever.yaml
diff --git a/deploy/roscore.env b/builder_scripts/assets/roscore.env
similarity index 100%
rename from deploy/roscore.env
rename to builder_scripts/assets/roscore.env
diff --git a/deploy/roscore.service b/builder_scripts/assets/roscore.service
similarity index 76%
rename from deploy/roscore.service
rename to builder_scripts/assets/roscore.service
index 56f949ac..b8cf1919 100644
--- a/deploy/roscore.service
+++ b/builder_scripts/assets/roscore.service
@@ -3,7 +3,7 @@ Description=Launcher for the ROS master, parameter server and rosout logging nod
 After=network.target
 
 [Service]
-EnvironmentFile=/home/pi/catkin_ws/src/clever/deploy/roscore.env
+EnvironmentFile=/root/roscore.env
 ExecStart=/opt/ros/kinetic/bin/roscore
 Restart=on-abort
 
diff --git a/builder_scripts/builder.sh b/builder_scripts/builder.sh
index f74129c9..04b4cbaa 100755
--- a/builder_scripts/builder.sh
+++ b/builder_scripts/builder.sh
@@ -13,8 +13,8 @@ cd ${IMAGE_BUILDER}
 # Make free space
 # ./resize_fs.sh ${IMAGE_PATH} '7G'
 
-# ./image_config.sh copy_to_chroot ${IMAGE_PATH} ${SCRIPTS_DIR}'/init_rpi.sh' '/root/'
-# ./image_config.sh copy_to_chroot ${IMAGE_PATH} ${SCRIPTS_DIR}'/hardware_setup.sh' '/root/'
+# ./image_config.sh copy_to_chroot ${IMAGE_PATH} ${SCRIPTS_DIR}'/assets/init_rpi.sh' '/root/'
+# ./image_config.sh copy_to_chroot ${IMAGE_PATH} ${SCRIPTS_DIR}'/assets/hardware_setup.sh' '/root/'
 
 # ./image_config.sh execute ${IMAGE_PATH} ${SCRIPTS_DIR}'/init_image.sh' ${CLEVER_VERSION} $(jq '.source_image' -r ${TARGET_CONFIG})
 # ./image_config.sh execute ${IMAGE_PATH} ${SCRIPTS_DIR}'/software_install.sh'
@@ -23,8 +23,12 @@ cd ${IMAGE_BUILDER}
 # # If RPi then use a one thread to build a ROS package on RPi, else use all
 # [[ $(arch) == 'armv7l' ]] && NUMBER_THREADS=1 || NUMBER_THREADS=$(nproc --all)
 
-# ./image_config.sh copy_to_chroot ${IMAGE_PATH} ${SCRIPTS_DIR}'/kinetic-rosdep-clever.yaml' '/etc/ros/rosdep/'
-# #./image_config.sh copy_to_chroot ${IMAGE_PATH} ${SCRIPTS_DIR}'/kinetic-ros-clever.rosinstall' '/home/pi/ros_catkin_ws/'
+# ./image_config.sh copy_to_chroot ${IMAGE_PATH} ${SCRIPTS_DIR}'/assets/clever.service' '/root/'
+# ./image_config.sh copy_to_chroot ${IMAGE_PATH} ${SCRIPTS_DIR}'/assets/roscore.env' '/root/'
+# ./image_config.sh copy_to_chroot ${IMAGE_PATH} ${SCRIPTS_DIR}'/assets/roscore.service' '/root/'
+
+# ./image_config.sh copy_to_chroot ${IMAGE_PATH} ${SCRIPTS_DIR}'/assets/kinetic-rosdep-clever.yaml' '/etc/ros/rosdep/'
+# #./image_config.sh copy_to_chroot ${IMAGE_PATH} ${SCRIPTS_DIR}'/assets/kinetic-ros-clever.rosinstall' '/home/pi/ros_catkin_ws/'
 # ./image_config.sh execute ${IMAGE_PATH} ${SCRIPTS_DIR}'/ros_install.sh' ${TARGET_REPO} ${TARGET_REF} False False ${NUMBER_THREADS} 
 
 # ./autosizer.sh ${IMAGE_PATH}
diff --git a/builder_scripts/ros_install.sh b/builder_scripts/ros_install.sh
index ee222ba1..4205b63e 100755
--- a/builder_scripts/ros_install.sh
+++ b/builder_scripts/ros_install.sh
@@ -59,7 +59,6 @@ resolve_rosdep() {
   || (echo_stamp "Rosdep installation was failed!" "ERROR"; exit 1)
 }
 
-
 INSTALL_ROS_PACK_SOURCES=${3:='False'}
 if [ "${INSTALL_ROS_PACK_SOURCES}" = "True" ]; then
   DISCOVER_ROS_PACK=${4:='True'}
@@ -128,8 +127,8 @@ echo_stamp "#12 Creating catkin_ws & Installing CLEVER-BUNDLE" \
   && ls -l /opt/ros/kinetic \
   && source /opt/ros/kinetic/setup.bash \
   && catkin_make -j$5 -DCMAKE_BUILD_TYPE=Release \
-  && ln -s /home/pi/catkin_ws/src/clever/deploy/roscore.service /lib/systemd/system/roscore.service \
-  && ln -s /home/pi/catkin_ws/src/clever/deploy/clever.service /lib/systemd/system/clever.service \
+  && ln -s /root/roscore.service /lib/systemd/system/roscore.service \
+  && ln -s /root/clever.service /lib/systemd/system/clever.service \
   && systemctl enable roscore \
   && systemctl enable clever \
   && echo_stamp "All CLEVER-BUNDLE was installed!" "SUCCESS" \