diff --git a/gazebo_sim/CMakeLists.txt b/gazebo_sim/CMakeLists.txt
new file mode 100644
index 0000000..1591e19
--- /dev/null
+++ b/gazebo_sim/CMakeLists.txt
@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 2.8.3)
+project(qt_pi_gazebo_sim)
+
+set(CMAKE_CXX_FLAGS "-fpermissive -std=c++0x")
+
+find_package(catkin REQUIRED)
+
+catkin_python_setup()
+catkin_package(DEPENDS)
diff --git a/launch/gazebo_sim/depth_to_laser_sim.launch b/gazebo_sim/launch/depth_to_laser.launch
similarity index 100%
rename from launch/gazebo_sim/depth_to_laser_sim.launch
rename to gazebo_sim/launch/depth_to_laser.launch
diff --git a/gazebo_sim/launch/gazebo_sim.launch b/gazebo_sim/launch/gazebo_sim.launch
new file mode 100644
index 0000000..2c1b212
--- /dev/null
+++ b/gazebo_sim/launch/gazebo_sim.launch
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/launch/gazebo_sim/gmapping_sim.launch b/gazebo_sim/launch/gmapping.launch
similarity index 100%
rename from launch/gazebo_sim/gmapping_sim.launch
rename to gazebo_sim/launch/gmapping.launch
diff --git a/launch/gazebo_sim/static_tf_sim.launch b/gazebo_sim/launch/static_tf.launch
similarity index 100%
rename from launch/gazebo_sim/static_tf_sim.launch
rename to gazebo_sim/launch/static_tf.launch
diff --git a/launch/gazebo_sim/teleop.launch b/gazebo_sim/launch/teleop.launch
similarity index 100%
rename from launch/gazebo_sim/teleop.launch
rename to gazebo_sim/launch/teleop.launch
diff --git a/gazebo_sim/package.xml b/gazebo_sim/package.xml
new file mode 100644
index 0000000..aa85652
--- /dev/null
+++ b/gazebo_sim/package.xml
@@ -0,0 +1,10 @@
+
+ qt_pi_gazebo_sim
+ 0.0.0
+ The qt_pi_gazebo_sim package
+ Rishabh Kundu
+ MIT
+ catkin
+
+
+
diff --git a/launch/gazebo_sim.launch b/launch/gazebo_sim.launch
deleted file mode 100644
index ce22b5d..0000000
--- a/launch/gazebo_sim.launch
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/CMakeLists.txt b/qt_pi/CMakeLists.txt
similarity index 100%
rename from CMakeLists.txt
rename to qt_pi/CMakeLists.txt
diff --git a/README.md b/qt_pi/README.md
similarity index 100%
rename from README.md
rename to qt_pi/README.md
diff --git a/config/base_local_planner_params.yaml b/qt_pi/config/base_local_planner_params.yaml
similarity index 100%
rename from config/base_local_planner_params.yaml
rename to qt_pi/config/base_local_planner_params.yaml
diff --git a/config/costmap_common_params.yaml b/qt_pi/config/costmap_common_params.yaml
similarity index 100%
rename from config/costmap_common_params.yaml
rename to qt_pi/config/costmap_common_params.yaml
diff --git a/config/global_costmap_params.yaml b/qt_pi/config/global_costmap_params.yaml
similarity index 100%
rename from config/global_costmap_params.yaml
rename to qt_pi/config/global_costmap_params.yaml
diff --git a/config/local_costmap_params.yaml b/qt_pi/config/local_costmap_params.yaml
similarity index 100%
rename from config/local_costmap_params.yaml
rename to qt_pi/config/local_costmap_params.yaml
diff --git a/config/qt_pi_arduino_params.yaml b/qt_pi/config/qt_pi_arduino_params.yaml
similarity index 100%
rename from config/qt_pi_arduino_params.yaml
rename to qt_pi/config/qt_pi_arduino_params.yaml
diff --git a/launch/arduino.launch b/qt_pi/launch/arduino.launch
similarity index 100%
rename from launch/arduino.launch
rename to qt_pi/launch/arduino.launch
diff --git a/launch/depth_to_laser.launch b/qt_pi/launch/depth_to_laser.launch
similarity index 100%
rename from launch/depth_to_laser.launch
rename to qt_pi/launch/depth_to_laser.launch
diff --git a/launch/gmapping.launch b/qt_pi/launch/gmapping.launch
similarity index 100%
rename from launch/gmapping.launch
rename to qt_pi/launch/gmapping.launch
diff --git a/launch/move_base.launch b/qt_pi/launch/move_base.launch
similarity index 100%
rename from launch/move_base.launch
rename to qt_pi/launch/move_base.launch
diff --git a/launch/qt_pi.launch b/qt_pi/launch/qt_pi.launch
similarity index 100%
rename from launch/qt_pi.launch
rename to qt_pi/launch/qt_pi.launch
diff --git a/msg/EEG_data.msg b/qt_pi/msg/EEG_data.msg
similarity index 100%
rename from msg/EEG_data.msg
rename to qt_pi/msg/EEG_data.msg
diff --git a/nodes/arduino_node.py b/qt_pi/nodes/arduino_node.py
similarity index 100%
rename from nodes/arduino_node.py
rename to qt_pi/nodes/arduino_node.py
diff --git a/package.xml b/qt_pi/package.xml
similarity index 100%
rename from package.xml
rename to qt_pi/package.xml
diff --git a/scripts/qt_pi/__init__.py b/qt_pi/scripts/qt_pi/__init__.py
similarity index 100%
rename from scripts/qt_pi/__init__.py
rename to qt_pi/scripts/qt_pi/__init__.py
diff --git a/scripts/qt_pi/arduino_driver.py b/qt_pi/scripts/qt_pi/arduino_driver.py
similarity index 100%
rename from scripts/qt_pi/arduino_driver.py
rename to qt_pi/scripts/qt_pi/arduino_driver.py
diff --git a/scripts/qt_pi/arduino_driver.pyc b/qt_pi/scripts/qt_pi/arduino_driver.pyc
similarity index 100%
rename from scripts/qt_pi/arduino_driver.pyc
rename to qt_pi/scripts/qt_pi/arduino_driver.pyc
diff --git a/scripts/qt_pi/base_controller.py b/qt_pi/scripts/qt_pi/base_controller.py
similarity index 100%
rename from scripts/qt_pi/base_controller.py
rename to qt_pi/scripts/qt_pi/base_controller.py
diff --git a/scripts/qt_pi/base_controller.pyc b/qt_pi/scripts/qt_pi/base_controller.pyc
similarity index 100%
rename from scripts/qt_pi/base_controller.pyc
rename to qt_pi/scripts/qt_pi/base_controller.pyc
diff --git a/setup.py b/qt_pi/setup.py
similarity index 100%
rename from setup.py
rename to qt_pi/setup.py
diff --git a/src/Ble_connect.cpp b/qt_pi/src/Ble_connect.cpp
similarity index 100%
rename from src/Ble_connect.cpp
rename to qt_pi/src/Ble_connect.cpp
diff --git a/src/libraries/Arduino/Arduino.ino b/qt_pi/src/libraries/Arduino/Arduino.ino
similarity index 100%
rename from src/libraries/Arduino/Arduino.ino
rename to qt_pi/src/libraries/Arduino/Arduino.ino
diff --git a/src/libraries/Arduino/commands.h b/qt_pi/src/libraries/Arduino/commands.h
similarity index 100%
rename from src/libraries/Arduino/commands.h
rename to qt_pi/src/libraries/Arduino/commands.h
diff --git a/src/libraries/Arduino/diff_controller.h b/qt_pi/src/libraries/Arduino/diff_controller.h
similarity index 100%
rename from src/libraries/Arduino/diff_controller.h
rename to qt_pi/src/libraries/Arduino/diff_controller.h
diff --git a/src/libraries/Arduino/encoder_driver.h b/qt_pi/src/libraries/Arduino/encoder_driver.h
similarity index 100%
rename from src/libraries/Arduino/encoder_driver.h
rename to qt_pi/src/libraries/Arduino/encoder_driver.h
diff --git a/src/libraries/Arduino/encoder_driver.ino b/qt_pi/src/libraries/Arduino/encoder_driver.ino
similarity index 100%
rename from src/libraries/Arduino/encoder_driver.ino
rename to qt_pi/src/libraries/Arduino/encoder_driver.ino
diff --git a/src/libraries/Arduino/motor_driver.h b/qt_pi/src/libraries/Arduino/motor_driver.h
similarity index 100%
rename from src/libraries/Arduino/motor_driver.h
rename to qt_pi/src/libraries/Arduino/motor_driver.h
diff --git a/src/libraries/Arduino/motor_driver.ino b/qt_pi/src/libraries/Arduino/motor_driver.ino
similarity index 100%
rename from src/libraries/Arduino/motor_driver.ino
rename to qt_pi/src/libraries/Arduino/motor_driver.ino