diff --git a/common/hal_interfaces/hal_interfaces/general/lidar.py b/common/hal_interfaces/hal_interfaces/general/lidar.py
new file mode 100644
index 000000000..315c3c45b
--- /dev/null
+++ b/common/hal_interfaces/hal_interfaces/general/lidar.py
@@ -0,0 +1,89 @@
+from rclpy.node import Node
+import sensor_msgs.msg
+from math import pi as PI
+
+
+### AUXILIARY FUNCTIONS
+class LidarData:
+
+    def __init__(self):
+
+        self.values = [] # Actual point data, size is (row_step*height)
+
+        # 2D structure of the point cloud. If the cloud is unordered, height is
+        # 1 and width is the length of the point cloud.
+        self.height = 0
+        self.width = 0
+
+        self.point_step = 0 # Length of a point in bytes
+        self.row_step = 0 # Length of a row in bytes
+        self.fields = [] # Describes the channels and their layout in the binary data blob.
+        self.is_dense = False # True if there are no invalid points
+        self.timeStamp = 0  # seconds
+
+    def __str__(self):
+        s = (
+            "LidarData: {\n   height: "
+            + str(self.height)
+            + "\n   width: "
+            + str(self.width)
+        )
+        s = (
+            s
+            + "\n   point_step: "
+            + str(self.point_step)
+            + "\n   row_step: "
+            + str(self.row_step)
+        )
+        s = (
+            s
+            + "\n   fields: "
+            + str(self.fields)
+            + "\n   is_dense: "
+            + str(self.is_dense)
+        )
+        s = (
+            s
+            + "\n   timeStamp: "
+            + str(self.timeStamp)
+            + "\n   values: "
+            + str(self.values)
+            + "\n}"
+        )
+        return s
+
+
+def lidarScan2LidarData(scan):
+    """
+    Translates from ROS LidarScan to JderobotTypes LidarData.
+    @param scan: ROS LidarScan to translate
+    @type scan: LidarScan
+    @return a LidarData translated from scan
+    """
+    lidar = LidarData()
+    lidar.values = scan.data
+    lidar.height = scan.height
+    lidar.width = scan.width
+    lidar.point_step = scan.point_step
+    lidar.row_step = scan.row_step
+    lidar.fields = scan.fields
+    lidar.is_dense = scan.is_dense
+    lidar.timeStamp = scan.header.stamp.sec + (scan.header.stamp.nanosec * 1e-9)
+    return lidar
+
+
+### HAL INTERFACE ###
+class LidarNode(Node):
+
+    def __init__(self, topic):
+        super().__init__("lidar_node")
+        self.sub = self.create_subscription(
+            sensor_msgs.msg.PointCloud2, topic, self.listener_callback, 10
+        )
+        self.last_scan_ = sensor_msgs.msg.PointCloud2()
+
+    def listener_callback(self, scan):
+        self.last_scan_ = scan
+
+    def getLidarData(self):
+        return lidarScan2LidarData(self.last_scan_)
diff --git a/common/hal_interfaces/hal_interfaces/specific/threed_reconstruction/parameters_camera.py b/common/hal_interfaces/hal_interfaces/specific/threed_reconstruction/parameters_camera.py
index 01b830618..b42cea801 100644
--- a/common/hal_interfaces/hal_interfaces/specific/threed_reconstruction/parameters_camera.py
+++ b/common/hal_interfaces/hal_interfaces/specific/threed_reconstruction/parameters_camera.py
@@ -7,7 +7,7 @@ def __init__(self, configFile, cam):
 
         if os.getcwd() == "/":
             f = open(
-                "/RoboticsAcademy/exercises/static/exercises/3d_reconstruction_newmanager/python_template/ros2_humble/" + configFile, "r")
+                "/RoboticsAcademy/exercises/static/exercises/3d_reconstruction/python_template/ros2_humble/" + configFile, "r")
         else:
             f = open(configFile, "r")
 
diff --git a/database/exercises/db.sql b/database/exercises/db.sql
index dd8d6b194..cc2c1a587 100644
--- a/database/exercises/db.sql
+++ b/database/exercises/db.sql
@@ -95,6 +95,7 @@ COPY public.exercises (id, exercise_id, name, description, tags, status, templat
 9	3d_reconstruction	3D Reconstruction	3D Reconstruction exercise using React and RAM	{"tags": ["ROS2","COMPUTER VISION"]}	ACTIVE	RoboticsAcademy/exercises/static/exercises/3d_reconstruction/python_template/
 10	amazon_warehouse	Amazon Warehouse	Control an amazon-like robot to organize a warehouse	{"tags": "ROS2"}	ACTIVE	RoboticsAcademy/exercises/static/exercises/amazon_warehouse/python_template/
 11	montecarlo_laser_loc	Montecarlo Laser Loc	Calculate the position of the robot based on the	{"tags": "ROS2"}	ACTIVE	RoboticsAcademy/exercises/static/exercises/montecarlo_laser_loc/python_template/
+12	autoparking_lidar	Autoparking with Lidar	Autoparking with Lidar exercise	{"tags": ["AUTONOMOUS DRIVING","SERVICE ROBOTS","ROS2"] }	ACTIVE	RoboticsAcademy/exercises/static/exercises/autoparking_lidar/python_template/
 \.
 
 
@@ -129,6 +130,7 @@ COPY public.exercises_universes (id, exercise_id, universe_id) FROM stdin;
 24	1	23
 25	1	24
 26	1	25
+27	12	26
 \.
 
 
diff --git a/exercises/static/exercises/assets/img/autoparking_lidar_teaser.png b/exercises/static/exercises/assets/img/autoparking_lidar_teaser.png
new file mode 100644
index 000000000..b65037a16
Binary files /dev/null and b/exercises/static/exercises/assets/img/autoparking_lidar_teaser.png differ
diff --git a/exercises/static/exercises/autoparking_lidar/python_template/ros2_humble/GUI.py b/exercises/static/exercises/autoparking_lidar/python_template/ros2_humble/GUI.py
new file mode 100755
index 000000000..0f49db390
--- /dev/null
+++ b/exercises/static/exercises/autoparking_lidar/python_template/ros2_humble/GUI.py
@@ -0,0 +1,38 @@
+import json
+
+from gui_interfaces.general.measuring_threading_gui import MeasuringThreadingGUI
+from console_interfaces.general.console import start_console
+from map import Map
+from HAL import getLidarData
+
+# Graphical User Interface Class
+
+class GUI(MeasuringThreadingGUI):
+
+    def __init__(self, host="ws://127.0.0.1:2303"):
+        super().__init__(host)
+
+        # Payload vars
+        self.payload = {'map': ''}
+        self.map = Map(getLidarData)
+
+        self.start()
+
+    # Prepares and sends a map to the websocket server
+    def update_gui(self):
+
+        map_message = self.map.get_json_data()
+        self.payload["map"] = map_message
+        message = json.dumps(self.payload)
+        self.send_to_client(message)
+
+
+    def reset_gui(self):
+        """Resets the GUI to its initial state."""
+        self.map.reset()
+
+host = "ws://127.0.0.1:2303"
+gui = GUI(host)
+
+# Redirect the console
+start_console()
diff --git a/exercises/static/exercises/autoparking_lidar/python_template/ros2_humble/HAL.py b/exercises/static/exercises/autoparking_lidar/python_template/ros2_humble/HAL.py
new file mode 100755
index 000000000..bf0964ea0
--- /dev/null
+++ b/exercises/static/exercises/autoparking_lidar/python_template/ros2_humble/HAL.py
@@ -0,0 +1,52 @@
+import rclpy
+import threading
+import time
+
+from hal_interfaces.general.motors import MotorsNode
+from hal_interfaces.general.odometry import OdometryNode
+from hal_interfaces.general.lidar import LidarNode
+
+# Hardware Abstraction Layer
+IMG_WIDTH = 320
+IMG_HEIGHT = 240
+freq = 30.0
+
+# ROS2 init
+
+print("HAL initializing", flush=True)
+if not rclpy.ok():
+    rclpy.init(args=None)
+
+    ### HAL INIT ###
+    motor_node = MotorsNode("/prius_autoparking/cmd_vel", 4, 0.3)
+    odometry_node = OdometryNode("/prius_autoparking/odom")
+    lidar_node = LidarNode("/prius_autoparking/cloud")
+
+    # Spin nodes so that subscription callbacks load topic data
+    executor = rclpy.executors.MultiThreadedExecutor()
+    executor.add_node(odometry_node)
+    executor.add_node(lidar_node)
+    def __auto_spin() -> None:
+        while rclpy.ok():
+            executor.spin_once(timeout_sec=0)
+            time.sleep(1/freq)
+    executor_thread = threading.Thread(target=__auto_spin, daemon=True)
+    executor_thread.start()
+
+
+def getPose3d():
+    return odometry_node.getPose3d()
+
+def getLidarData():
+    lidar = lidar_node.getLidarData()
+    timestamp = lidar.timeStamp
+    while timestamp == 0.0:
+        lidar = lidar_node.getLidarData()
+        timestamp = lidar.timeStamp
+    return lidar
+
+def setV(velocity):
+    motor_node.sendV(float(velocity))
+
+def setW(velocity):
+    motor_node.sendW(float(velocity))
\ No newline at end of file
diff --git a/exercises/static/exercises/autoparking_lidar/python_template/ros2_humble/map.py b/exercises/static/exercises/autoparking_lidar/python_template/ros2_humble/map.py
new file mode 100644
index 000000000..97d37e173
--- /dev/null
+++ b/exercises/static/exercises/autoparking_lidar/python_template/ros2_humble/map.py
@@ -0,0 +1,36 @@
+import json
+import math
+import numpy as np
+
+class Map:
+	def __init__(self, lidar_object):
+		# Define the object used for
+		# websocket communication
+		self.payload = {}
+
+		self.lidar_topic = lidar_object
+        
+    # Get the JSON data as string
+	def get_json_data(self):
+		self.payload["lasers"], self.payload["ranges"] = self.setLaserValues()
+
+		message = json.dumps(self.payload)
+		return message
+    	
+	def RTx(self, angle, tx, ty, tz):
+		RT = np.matrix([[1, 0, 0, tx], [0, math.cos(angle), -math.sin(angle), ty], [0, math.sin(angle), math.cos(angle), tz], [0,0,0,1]])
+		return RT
+        
+	def RTy(self, angle, tx, ty, tz):
+		RT = np.matrix([[math.cos(angle), 0, math.sin(angle), tx], [0, 1, 0, ty], [-math.sin(angle), 0, math.cos(angle), tz], [0,0,0,1]])
+		return RT
+    
+	def RTz(self, angle, tx, ty, tz):
+		RT = np.matrix([[math.cos(angle), -math.sin(angle), 0, tx], [math.sin(angle), math.cos(angle),0, ty], [0, 0, 1, tz], [0,0,0,1]])
+		return RT  	
+        
+	# Interpret the Laser values
+	def setLaserValues(self):
+		# Init laser array
+		self.lidar = self.lidar_topic()
+		return self.lidar
\ No newline at end of file
diff --git a/exercises/static/exercises/autoparking_lidar/react-components/AutoparkingRR.js b/exercises/static/exercises/autoparking_lidar/react-components/AutoparkingRR.js
new file mode 100644
index 000000000..d5777aa40
--- /dev/null
+++ b/exercises/static/exercises/autoparking_lidar/react-components/AutoparkingRR.js
@@ -0,0 +1,14 @@
+import * as React from "react";
+import {Fragment} from "react";
+
+import "./css/AutoparkingRR.css";
+
+const AutoparkingRR = (props) => {
+  return (
+    <Fragment>
+    {props.children}
+    </Fragment>
+  );
+};
+
+export default AutoparkingRR;
\ No newline at end of file
diff --git a/exercises/static/exercises/autoparking_lidar/react-components/Lasers.js b/exercises/static/exercises/autoparking_lidar/react-components/Lasers.js
new file mode 100644
index 000000000..19d161bd9
--- /dev/null
+++ b/exercises/static/exercises/autoparking_lidar/react-components/Lasers.js
@@ -0,0 +1,63 @@
+import React from "react"
+import "./css/GUICanvas.css";
+import Car from "../resources/images/car-top-view.svg";
+
+const Lasers = (props) => {
+    const meter = 73; // 1m = 73px
+
+    const [laser, setLaser] = React.useState([])
+    const [maxRange, setMaxRange] = React.useState([])
+
+    React.useEffect(() => {
+        const callback = (message) => {
+            if(message.data.update.map){
+              const map_data = JSON.parse(message.data.update.map);
+              console.log(map_data)
+              setLaser (map_data.lasers[0])
+              setMaxRange (map_data.ranges[0])
+              console.log(map_data.ranges)
+            }
+            // Send the ACK of the msg
+            window.RoboticsExerciseComponents.commsManager.send("gui", "ack");
+        };
+        RoboticsExerciseComponents.commsManager.subscribe(
+          [RoboticsExerciseComponents.commsManager.events.UPDATE],
+          callback
+        );
+    
+        return () => {
+          console.log("TestShowScreen unsubscribing from ['state-changed'] events");
+          RoboticsExerciseComponents.commsManager.unsubscribe(
+            [RoboticsExerciseComponents.commsManager.events.UPDATE],
+            callback
+          );
+        };
+      }, []);
+
+    return (
+      <div style={{display: "flex",   width: "100%",
+        height: "100%", backgroundColor: "#363233", position:"relative", overflow:"hidden"
+      }}>
+        <img src={Car} id="car"/>
+        {laser.map(element => {
+          var ang = -element[1]
+          var length = (element[0] / 75) * meter;
+          return (
+            <hr className="laser-beam" 
+              style={{
+              rotate: "z "+ ang +"rad",
+              width: length + "px",
+              position: "absolute",
+              background: "repeating-linear-gradient(to right,rgb(255, 112, 112),rgb(255, 112, 112) 73px,rgb(175, 29, 29)  73px,rgb(175, 29, 29) 146px)",
+              backgroundSize: "100% 1px",
+              bottom: "59%",
+              left: "50%",
+              transformOrigin: "0% 0%",
+              zIndex: "3"}}
+            />
+        )})
+        }
+	    </div>
+)};
+
+export default Lasers;
\ No newline at end of file
diff --git a/exercises/static/exercises/autoparking_lidar/react-components/css/AutoparkingRR.css b/exercises/static/exercises/autoparking_lidar/react-components/css/AutoparkingRR.css
new file mode 100644
index 000000000..3bdee7925
--- /dev/null
+++ b/exercises/static/exercises/autoparking_lidar/react-components/css/AutoparkingRR.css
@@ -0,0 +1,28 @@
+* {
+    box-sizing: border-box;
+}
+
+body, html {
+    width: 100%; height: 100%;
+}
+
+#exercise-container {
+    position: absolute;
+    top: 0; left: 0; bottom: 0; right: 0;
+    overflow: hidden;
+    display: flex;
+    flex-direction: column;
+}
+
+#exercise-container #content {
+    width: 100%;
+    height: 100%;
+    overflow: hidden;
+}
+
+#exercise-container #content #content-exercise {
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+    height: 100%;
+}
\ No newline at end of file
diff --git a/exercises/static/exercises/autoparking_lidar/react-components/css/GUICanvas.css b/exercises/static/exercises/autoparking_lidar/react-components/css/GUICanvas.css
new file mode 100644
index 000000000..b8f9412c6
--- /dev/null
+++ b/exercises/static/exercises/autoparking_lidar/react-components/css/GUICanvas.css
@@ -0,0 +1,24 @@
+#car {
+  position: absolute;
+  width: 91px;
+  height: 100px;
+  top: calc(50% - 68px);
+  left: calc(50% - 45.5px);
+  z-index: 2
+}
+
+/* .laser-beam {
+  position: absolute;
+  background: repeating-linear-gradient(
+    to right,
+    rgb(112, 138, 255),
+    rgb(112, 138, 255) 73px,
+    rgb(100, 198, 255) 73px,
+    rgb(100, 198, 255) 146px
+  );
+  background-size: 100% 1px;
+  bottom: 50%;
+  left: 50%;
+  transform-origin: 0% 0%;
+  z-index: 3;
+} */
diff --git a/exercises/static/exercises/autoparking_lidar/resources/images/car-top-view.svg b/exercises/static/exercises/autoparking_lidar/resources/images/car-top-view.svg
new file mode 100644
index 000000000..db10abd1f
--- /dev/null
+++ b/exercises/static/exercises/autoparking_lidar/resources/images/car-top-view.svg
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   fill="#ff0"
+   height="800px"
+   width="800px"
+   version="1.1"
+   viewBox="0 0 47.032 47.032"
+   xml:space="preserve"
+   id="svg1"
+   sodipodi:docname="car-top-view.svg"
+   inkscape:version="1.3.2 (091e20ef0f, 2023-11-25)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+   id="defs1" /><sodipodi:namedview
+   id="namedview1"
+   pagecolor="#505050"
+   bordercolor="#eeeeee"
+   borderopacity="1"
+   inkscape:showpageshadow="0"
+   inkscape:pageopacity="0"
+   inkscape:pagecheckerboard="0"
+   inkscape:deskcolor="#505050"
+   showgrid="false"
+   inkscape:zoom="1.21125"
+   inkscape:cx="400"
+   inkscape:cy="466.04747"
+   inkscape:window-width="2048"
+   inkscape:window-height="1211"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="svg1" />
+<g
+   id="g1">
+	<path
+   d="M29.395,0H17.636c-3.117,0-5.643,3.467-5.643,6.584v34.804c0,3.116,2.526,5.644,5.643,5.644h11.759   c3.116,0,5.644-2.527,5.644-5.644V6.584C35.037,3.467,32.511,0,29.395,0z M34.05,14.188v11.665l-2.729,0.351v-4.806L34.05,14.188z    M32.618,10.773c-1.016,3.9-2.219,8.51-2.219,8.51H16.631l-2.222-8.51C14.41,10.773,23.293,7.755,32.618,10.773z M15.741,21.713   v4.492l-2.73-0.349V14.502L15.741,21.713z M13.011,37.938V27.579l2.73,0.343v8.196L13.011,37.938z M14.568,40.882l2.218-3.336   h13.771l2.219,3.336H14.568z M31.321,35.805v-7.872l2.729-0.355v10.048L31.321,35.805z"
+   id="path1" />
+</g>
+<path
+   style="fill:#3b4142;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none"
+   d="m 264.66583,256.54587 c -10.18199,-39.16008 -18.65313,-71.61082 -18.82476,-72.11274 -0.53559,-1.56629 25.03543,-8.37234 48.91204,-13.01856 39.82845,-7.75033 77.9908,-10.97847 120.10757,-10.15988 40.76568,0.79234 76.18329,5.31182 111.65867,14.24824 7.14586,1.80007 27.19416,7.65675 27.60021,8.0628 0.0859,0.0859 -8.27469,32.47202 -18.57912,71.96913 l -18.73533,71.81292 -116.81329,0.19912 -116.81329,0.19912 z"
+   id="path2"
+   transform="scale(0.05879)" /><path
+   style="fill:#3b4142;fill-opacity:1;stroke:#000000;stroke-width:1.65119;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none"
+   d="m 242.55456,442.19183 c -10.99127,-1.44536 -20.1879,-2.83171 -20.43695,-3.08075 -0.24904,-0.24905 -0.35835,-42.9166 -0.2429,-94.81679 l 0.20991,-94.36397 22.49742,59.42399 22.49742,59.42399 v 38.10827 38.10827 l -2.27038,-0.0875 c -1.24871,-0.0481 -11.26324,-1.27011 -22.25452,-2.71548 z"
+   id="path3"
+   transform="scale(0.05879)" /><path
+   style="fill:#3b4142;fill-opacity:1;stroke:#000000;stroke-width:1.65119;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none"
+   d="m 532.92054,404.91122 v -40.0836 l 22.91021,-60.54207 22.91022,-60.54206 0.2098,97.4575 c 0.11538,53.60163 0.0361,97.63123 -0.17626,97.84356 -0.38713,0.38714 -41.69533,5.90838 -44.40918,5.93573 -1.35636,0.0137 -1.44479,-2.43903 -1.44479,-40.06906 z"
+   id="path4"
+   transform="scale(0.05879)" /><path
+   style="fill:#3b4142;fill-opacity:1;stroke:#000000;stroke-width:1.65119;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none"
+   d="m 555.41796,623.61752 -22.49742,-15.18719 v -66.3717 -66.3717 l 3.09597,-0.50238 c 4.67678,-0.75889 40.86605,-5.42191 42.07895,-5.42191 0.8538,0 1.05831,16.35283 1.05831,84.62332 0,46.54283 -0.27864,84.5773 -0.6192,84.52104 -0.34056,-0.0563 -10.74303,-6.93652 -23.11661,-15.28948 z"
+   id="path5"
+   transform="scale(0.05879)" /><path
+   style="fill:#3b4142;fill-opacity:1;stroke:#000000;stroke-width:1.65119;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none"
+   d="m 249.49458,693.98878 c 0.36312,-0.63847 8.64783,-13.26764 18.41048,-28.06482 l 17.75025,-26.90397 116.89378,-0.005 116.89378,-0.005 18.71126,28.07017 18.71126,28.07018 H 402.84987 c -132.09358,0 -153.92154,-0.16523 -153.35529,-1.16086 z"
+   id="path6"
+   transform="scale(0.05879)" /><path
+   style="fill:#3b4142;fill-opacity:1;stroke:#000000;stroke-width:1.65119;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none"
+   d="m 221.67183,556.86275 c 0,-82.41664 0.0777,-87.09805 1.44479,-87.06191 0.79463,0.021 10.91847,1.23623 22.49742,2.70049 l 21.05263,2.6623 0.21108,69.52828 0.21109,69.52828 -22.28445,14.87134 c -12.25644,8.17922 -22.47527,14.87132 -22.7085,14.87132 -0.23324,0 -0.42406,-39.19505 -0.42406,-87.1001 z"
+   id="path7"
+   transform="scale(0.05879)" /></svg>
diff --git a/exercises/templates/exercises/3d_reconstruction/exercise.html b/exercises/templates/exercises/3d_reconstruction/exercise.html
index 0a6e615f2..24ce4b27d 100644
--- a/exercises/templates/exercises/3d_reconstruction/exercise.html
+++ b/exercises/templates/exercises/3d_reconstruction/exercise.html
@@ -3,20 +3,20 @@
 {% load static %}
 
 {% block exercise_header %}
-<script src="{% static 'exercises/3d_reconstruction_newmanager/3DScene/three.js' %}" type="text/javascript" charset="utf-8"></script>
-<script src="{% static 'exercises/3d_reconstruction_newmanager/3DScene/OrbitControls.js' %}" type="text/javascript" charset="utf-8"></script>
-<script src="{% static 'exercises/3d_reconstruction_newmanager/3DScene/OBJLoader.js' %}" type="text/javascript" charset="utf-8"></script>
-<script src="{% static 'exercises/3d_reconstruction_newmanager/3DScene/ColladaLoader.js' %}" type="text/javascript" charset="utf-8"></script>
-<script src="{% static 'exercises/3d_reconstruction_newmanager/3DScene/3d_scene.js' %}" type="text/javascript" charset="utf-8"></script>
-<script src="{% static 'exercises/3d_reconstruction_newmanager/3DScene/3DViz.js' %}" type="text/javascript" charset="utf-8"></script>
-<script src="{% static 'exercises/3d_reconstruction_newmanager/3DScene/pose3d.js' %}" type="text/javascript" charset="utf-8"></script>
+<script src="{% static 'exercises/3d_reconstruction/3DScene/three.js' %}" type="text/javascript" charset="utf-8"></script>
+<script src="{% static 'exercises/3d_reconstruction/3DScene/OrbitControls.js' %}" type="text/javascript" charset="utf-8"></script>
+<script src="{% static 'exercises/3d_reconstruction/3DScene/OBJLoader.js' %}" type="text/javascript" charset="utf-8"></script>
+<script src="{% static 'exercises/3d_reconstruction/3DScene/ColladaLoader.js' %}" type="text/javascript" charset="utf-8"></script>
+<script src="{% static 'exercises/3d_reconstruction/3DScene/3d_scene.js' %}" type="text/javascript" charset="utf-8"></script>
+<script src="{% static 'exercises/3d_reconstruction/3DScene/3DViz.js' %}" type="text/javascript" charset="utf-8"></script>
+<script src="{% static 'exercises/3d_reconstruction/3DScene/pose3d.js' %}" type="text/javascript" charset="utf-8"></script>
 <script src='https://huningxin.github.io/opencv.js/build/asm.js/opencv.js' async></script>
 <script> window.onload = function() {webGLStart();}</script>
 {% endblock %}
 
 {% block react-content %}
     {% if deployment %}
-        {% react_component exercise/3d_reconstruction_newmanager/Reconstruction3DRR %}
+        {% react_component exercise/3d_reconstruction/Reconstruction3DRR %}
             {% react_component components/containers/MaterialBox id="exercise-container" %}
             {% react_component components/common/MainAppBar exerciseName="3D Recontruction" url="https://jderobot.github.io/RoboticsAcademy/exercises/ComputerVision/3d_reconstruction"%} 
             {% react_component RA_links/WorldSelectorRA %} {% end_react_component %}  
@@ -30,7 +30,7 @@
                         {% react_component components/visualizers/VncConsoleViewer%}{% end_react_component %}
                         {% end_react_component%}
                         {% react_component components/containers/FlexContainer%} 
-                            {% react_component exercise/3d_reconstruction_newmanager/SpecificReconstruction3D%}{% end_react_component %}
+                            {% react_component exercise/3d_reconstruction/SpecificReconstruction3D%}{% end_react_component %}
                             {% react_component components/visualizers/GazeboViewer%}{% end_react_component %}
                         {% end_react_component %}
                 {% end_react_component %}
@@ -41,7 +41,7 @@
 {% end_react_component %}
     {% end_react_component %}
     {% else %}
-        {% react_component exercise/3d_reconstruction_newmanager/Reconstruction3DRR %}
+        {% react_component exercise/3d_reconstruction/Reconstruction3DRR %}
             {% react_component components/wrappers/MaterialBox id="exercise-container" %}
                 {% react_component components/layout_components/MainAppBar exerciseName="3D Recontruction" url="https://jderobot.github.io/RoboticsAcademy/exercises/ComputerVision/3d_reconstruction"%} 
                 {% react_component components/visualizers/WorldSelector %} {% end_react_component %}  
@@ -55,7 +55,7 @@
                     {% react_component components/visualizers/ConsoleViewer%}{% end_react_component %}
                         {% end_react_component%}
                         {% react_component components/wrappers/FlexContainer%} 
-                            {% react_component exercise/3d_reconstruction_newmanager/SpecificReconstruction3D%}{% end_react_component %}
+                            {% react_component exercise/3d_reconstruction/SpecificReconstruction3D%}{% end_react_component %}
                             {% react_component components/visualizers/GazeboViewer%}{% end_react_component %}
                         {% end_react_component %}
                 {% end_react_component %}
diff --git a/exercises/templates/exercises/amazon_warehouse/exercise.html b/exercises/templates/exercises/amazon_warehouse/exercise.html
index 1deee0e79..aa31861e8 100644
--- a/exercises/templates/exercises/amazon_warehouse/exercise.html
+++ b/exercises/templates/exercises/amazon_warehouse/exercise.html
@@ -6,7 +6,7 @@
 
 {% block react-content %}
     {% if deployment %}
-        {% react_component exercise/amazon_warehouse_newmanager/AmazonWarehouseRR %}
+        {% react_component exercise/amazon_warehouse/AmazonWarehouseRR %}
             {% react_component components/containers/MaterialBox id="exercise-container" %}
             {% react_component components/common/MainAppBar exerciseName="Amazon Warehouse" url="https://jderobot.github.io/RoboticsAcademy/exercises/MobileRobots/amazon_warehouse/"%} 
             {% react_component RA_links/WorldSelectorRA %} {% end_react_component %}  
@@ -20,7 +20,7 @@
                         {% react_component components/visualizers/VncConsoleViewer%}{% end_react_component %}
                         {% end_react_component%}
                         {% react_component components/containers/FlexContainer%} 
-                            {% react_component exercise/amazon_warehouse_newmanager/SpecificAmazonWarehouse %}{% end_react_component %}
+                            {% react_component exercise/amazon_warehouse/SpecificAmazonWarehouse %}{% end_react_component %}
                             {% react_component components/visualizers/GazeboViewer%}{% end_react_component %}
                         {% end_react_component %}
                 {% end_react_component %}
@@ -31,7 +31,7 @@
 {% end_react_component %}
     {% end_react_component %}
     {% else %}
-        {% react_component exercise/amazon_warehouse_newmanager/AmazonWarehouseRR %}
+        {% react_component exercise/amazon_warehouse/AmazonWarehouseRR %}
             {% react_component components/wrappers/MaterialBox id="exercise-container" %}
                 {% react_component components/layout_components/MainAppBar exerciseName="Amazon Warehouse" url="https://jderobot.github.io/RoboticsAcademy/exercises/MobileRobots/amazon_warehouse/"%} 
                 {% react_component components/visualizers/WorldSelector %} {% end_react_component %}  
@@ -45,7 +45,7 @@
                     {% react_component components/visualizers/ConsoleViewer%}{% end_react_component %}
                         {% end_react_component%}
                         {% react_component components/wrappers/FlexContainer%} 
-                            {% react_component exercise/amazon_warehouse_newmanager/SpecificAmazonWarehouse %}{% end_react_component %}
+                            {% react_component exercise/amazon_warehouse/SpecificAmazonWarehouse %}{% end_react_component %}
                             {% react_component components/visualizers/GazeboViewer%}{% end_react_component %}
                         {% end_react_component %}
                 {% end_react_component %}
diff --git a/exercises/templates/exercises/autoparking/exercise.html b/exercises/templates/exercises/autoparking/exercise.html
index dab05058d..d269b3b23 100644
--- a/exercises/templates/exercises/autoparking/exercise.html
+++ b/exercises/templates/exercises/autoparking/exercise.html
@@ -6,7 +6,7 @@
 
 {% block react-content %}
     {% if deployment %}
-        {% react_component exercise/autoparking_newmanager/AutoparkingRR %}
+        {% react_component exercise/autoparking/AutoparkingRR %}
             {% react_component components/containers/MaterialBox id="exercise-container" %}
             {% react_component components/common/MainAppBar exerciseName="Autoparking" url="https://jderobot.github.io/RoboticsAcademy/exercises/AutonomousCars/autoparking/"%} 
             {% react_component RA_links/WorldSelectorRA %} {% end_react_component %}  
@@ -20,7 +20,7 @@
                         {% react_component components/visualizers/VncConsoleViewer%}{% end_react_component %}
                         {% end_react_component%}
                         {% react_component components/containers/FlexContainer%} 
-                            {% react_component exercise/autoparking_newmanager/Lasers%}{% end_react_component %}
+                            {% react_component exercise/autoparking/Lasers%}{% end_react_component %}
                             {% react_component components/visualizers/GazeboViewer%}{% end_react_component %}
                         {% end_react_component %}
                 {% end_react_component %}
@@ -31,7 +31,7 @@
 {% end_react_component %}
     {% end_react_component %}
     {% else %}
-        {% react_component exercise/autoparking_newmanager/AutoparkingRR %}
+        {% react_component exercise/autoparking/AutoparkingRR %}
             {% react_component components/wrappers/MaterialBox id="exercise-container" %}
                 {% react_component components/layout_components/MainAppBar exerciseName="Autoparking" url="https://jderobot.github.io/RoboticsAcademy/exercises/AutonomousCars/autoparking/"%} 
                 {% react_component components/visualizers/WorldSelector %} {% end_react_component %}  
@@ -45,7 +45,7 @@
                     {% react_component components/visualizers/ConsoleViewer%}{% end_react_component %}
                         {% end_react_component%}
                         {% react_component components/wrappers/FlexContainer%} 
-                            {% react_component exercise/autoparking_newmanager/Lasers%}{% end_react_component %}
+                            {% react_component exercise/autoparking/Lasers%}{% end_react_component %}
                             {% react_component components/visualizers/GazeboViewer%}{% end_react_component %}
                         {% end_react_component %}
                 {% end_react_component %}
diff --git a/exercises/templates/exercises/autoparking_lidar/exercise.html b/exercises/templates/exercises/autoparking_lidar/exercise.html
new file mode 100644
index 000000000..488e9d4da
--- /dev/null
+++ b/exercises/templates/exercises/autoparking_lidar/exercise.html
@@ -0,0 +1,59 @@
+{% extends "react_frontend/exercise_base.html" %}
+{% load react_component %}
+
+{% block exercise_header %}
+{% endblock %}
+
+{% block react-content %}
+    {% if deployment %}
+        {% react_component exercise/autoparking_lidar/AutoparkingRR %}
+            {% react_component components/containers/MaterialBox id="exercise-container" %}
+            {% react_component components/common/MainAppBar exerciseName="Autoparking Lidar" url="https://jderobot.github.io/RoboticsAcademy/exercises/AutonomousCars/autoparking/"%} 
+            {% react_component RA_links/WorldSelectorRA %} {% end_react_component %}  
+            {% end_react_component %}
+            {% react_component components/containers/MaterialBox id="content" %}
+                {% react_component components/containers/MaterialBox id="content-exercise" %}
+                    {% react_component components/containers/ExerciseControl %}{% end_react_component %}
+                    {% react_component components/containers/FlexContainer row %}
+                    {% react_component components/containers/FlexContainer console %} 
+                    {% react_component components/editors/EditorRobot %}{% end_react_component %}
+                        {% react_component components/visualizers/VncConsoleViewer%}{% end_react_component %}
+                        {% end_react_component%}
+                        {% react_component components/containers/FlexContainer%} 
+                            {% react_component exercise/autoparking_lidar/Lasers%}{% end_react_component %}
+                            {% react_component components/visualizers/GazeboViewer%}{% end_react_component %}
+                        {% end_react_component %}
+                {% end_react_component %}
+            {% end_react_component %}
+            {% react_component components/message-system/Loading %}{% end_react_component %}
+            {% react_component components/message-system/Alert %}{% end_react_component %}
+{% end_react_component %}
+{% end_react_component %}
+    {% end_react_component %}
+    {% else %}
+        {% react_component exercise/autoparking_lidar/AutoparkingRR %}
+            {% react_component components/wrappers/MaterialBox id="exercise-container" %}
+                {% react_component components/layout_components/MainAppBar exerciseName="Autoparking Lidar" url="https://jderobot.github.io/RoboticsAcademy/exercises/AutonomousCars/autoparking/"%} 
+                {% react_component components/visualizers/WorldSelector %} {% end_react_component %}  
+                {% end_react_component %} 
+            {% react_component components/wrappers/MaterialBox id="content" %}
+                {% react_component components/wrappers/MaterialBox id="content-exercise" %}
+                    {% react_component components/layout_components/ExerciseControl %}{% end_react_component %}
+                    {% react_component components/wrappers/FlexContainer row %}
+                    {% react_component components/wrappers/FlexContainer console %} 
+                    {% react_component components/editors/EditorRobot %}{% end_react_component %}
+                    {% react_component components/visualizers/ConsoleViewer%}{% end_react_component %}
+                        {% end_react_component%}
+                        {% react_component components/wrappers/FlexContainer%} 
+                            {% react_component exercise/autoparking_lidar/Lasers%}{% end_react_component %}
+                            {% react_component components/visualizers/GazeboViewer%}{% end_react_component %}
+                        {% end_react_component %}
+                {% end_react_component %}
+            {% end_react_component %}
+            {% react_component components/message_system/Loading %}{% end_react_component %}
+            {% react_component components/message_system/Alert %}{% end_react_component %}
+    {% end_react_component %}
+    {% end_react_component %}
+    {% end_react_component %}
+    {% endif %}
+{% endblock %}
\ No newline at end of file
diff --git a/exercises/templates/exercises/follow_line/exercise.html b/exercises/templates/exercises/follow_line/exercise.html
index 8100f67c7..1b277dc39 100644
--- a/exercises/templates/exercises/follow_line/exercise.html
+++ b/exercises/templates/exercises/follow_line/exercise.html
@@ -6,7 +6,7 @@
 
 {% block react-content %}
     {% if deployment %}
-        {% react_component exercise/follow_line_newmanager/FollowLineRR %}
+        {% react_component exercise/follow_line/FollowLineRR %}
             {% react_component components/containers/MaterialBox id="exercise-container" %}
             {% react_component components/common/MainAppBar exerciseName="Follow Line" url="https://jderobot.github.io/RoboticsAcademy/exercises/AutonomousCars/follow_line/"%} 
             {% react_component RA_links/WorldSelectorRA %} {% end_react_component %}  
@@ -31,7 +31,7 @@
 {% end_react_component %}
     {% end_react_component %}
     {% else %}
-        {% react_component exercise/follow_line_newmanager/FollowLineRR %}
+        {% react_component exercise/follow_line/FollowLineRR %}
             {% react_component components/wrappers/MaterialBox id="exercise-container" %}
                 {% react_component components/layout_components/MainAppBar exerciseName="Follow Line" url="https://jderobot.github.io/RoboticsAcademy/exercises/AutonomousCars/follow_line/"%} 
                 {% react_component components/visualizers/WorldSelector %} {% end_react_component %}  
@@ -45,7 +45,7 @@
                     {% react_component components/visualizers/ConsoleViewer%}{% end_react_component %}
                         {% end_react_component%}
                         {% react_component components/wrappers/FlexContainer%} 
-                            {% react_component exercise/follow_line_newmanager/SpecificFollowLine %}{% end_react_component %}
+                            {% react_component exercise/follow_line/SpecificFollowLine %}{% end_react_component %}
                             {% react_component components/visualizers/GazeboViewer%}{% end_react_component %}
                         {% end_react_component %}
                 {% end_react_component %}
diff --git a/exercises/templates/exercises/follow_person/exercise.html b/exercises/templates/exercises/follow_person/exercise.html
index 4d50c30a9..f29d7a65f 100644
--- a/exercises/templates/exercises/follow_person/exercise.html
+++ b/exercises/templates/exercises/follow_person/exercise.html
@@ -6,7 +6,7 @@
 
 {% block react-content %}
     {% if deployment %}
-        {% react_component exercise/follow_person_newmanager/FollowPersonRR %}
+        {% react_component exercise/follow_person/FollowPersonRR %}
             {% react_component components/containers/MaterialBox id="exercise-container" %}
             {% react_component components/common/MainAppBar exerciseName="Follow Person" url="https://jderobot.github.io/RoboticsAcademy/exercises/MobileRobots/follow_person"%} 
             {% react_component RA_links/WorldSelectorRA %} {% end_react_component %}  
@@ -20,7 +20,7 @@
                         {% react_component components/visualizers/VncConsoleViewer%}{% end_react_component %}
                         {% end_react_component%}
                         {% react_component components/containers/FlexContainer%} 
-                            {% react_component exercise/follow_person_newmanager/ImgCanvas %}{% end_react_component %}
+                            {% react_component exercise/follow_person/ImgCanvas %}{% end_react_component %}
                             {% react_component components/visualizers/GazeboViewer%}{% end_react_component %}
                         {% end_react_component %}
                 {% end_react_component %}
@@ -31,7 +31,7 @@
 {% end_react_component %}
     {% end_react_component %}
     {% else %}
-        {% react_component exercise/follow_person_newmanager/FollowPersonRR %}
+        {% react_component exercise/follow_person/FollowPersonRR %}
             {% react_component components/wrappers/MaterialBox id="exercise-container" %}
                 {% react_component components/layout_components/MainAppBar exerciseName="Follow Person" url="https://jderobot.github.io/RoboticsAcademy/exercises/MobileRobots/follow_person"%} 
                 {% react_component components/visualizers/WorldSelector %} {% end_react_component %}  
@@ -45,7 +45,7 @@
                     {% react_component components/visualizers/ConsoleViewer%}{% end_react_component %}
                         {% end_react_component%}
                         {% react_component components/wrappers/FlexContainer%} 
-                            {% react_component exercise/follow_person_newmanager/ImgCanvas %}{% end_react_component %}
+                            {% react_component exercise/follow_person/ImgCanvas %}{% end_react_component %}
                             {% react_component components/visualizers/GazeboViewer%}{% end_react_component %}
                         {% end_react_component %}
                 {% end_react_component %}
diff --git a/exercises/templates/exercises/global_navigation/exercise.html b/exercises/templates/exercises/global_navigation/exercise.html
index fba07e68f..66ed011a0 100644
--- a/exercises/templates/exercises/global_navigation/exercise.html
+++ b/exercises/templates/exercises/global_navigation/exercise.html
@@ -6,7 +6,7 @@
 
 {% block react-content %}
     {% if deployment %}
-        {% react_component exercise/global_navigation_newmanager/globalNavigationRR %}
+        {% react_component exercise/global_navigation/globalNavigationRR %}
             {% react_component components/containers/MaterialBox id="exercise-container" %}
             {% react_component components/common/MainAppBar exerciseName="Global Navigation" url="https://jderobot.github.io/RoboticsAcademy/exercises/AutonomousCars/global_navigation/"%} 
             {% react_component RA_links/WorldSelectorRA %} {% end_react_component %}  
@@ -20,7 +20,7 @@
                         {% react_component components/visualizers/VncConsoleViewer%}{% end_react_component %}
                         {% end_react_component%}
                         {% react_component components/containers/FlexContainer%} 
-                            {% react_component exercise/global_navigation_newmanager/GlobalNavigationSpecific %}{% end_react_component %}
+                            {% react_component exercise/global_navigation/GlobalNavigationSpecific %}{% end_react_component %}
                             {% react_component components/visualizers/GazeboViewer%}{% end_react_component %}
                         {% end_react_component %}
                 {% end_react_component %}
@@ -31,7 +31,7 @@
 {% end_react_component %}
     {% end_react_component %}
     {% else %}
-        {% react_component exercise/global_navigation_newmanager/globalNavigationRR %}
+        {% react_component exercise/global_navigation/globalNavigationRR %}
             {% react_component components/wrappers/MaterialBox id="exercise-container" %}
                 {% react_component components/layout_components/MainAppBar exerciseName="Global Navigation" url="https://jderobot.github.io/RoboticsAcademy/exercises/AutonomousCars/global_navigation/"%} 
                 {% react_component components/visualizers/WorldSelector %} {% end_react_component %}  
@@ -45,7 +45,7 @@
                     {% react_component components/visualizers/ConsoleViewer%}{% end_react_component %}
                         {% end_react_component%}
                         {% react_component components/wrappers/FlexContainer%} 
-                            {% react_component exercise/global_navigation_newmanager/GlobalNavigationSpecific %}{% end_react_component %}
+                            {% react_component exercise/global_navigation/GlobalNavigationSpecific %}{% end_react_component %}
                             {% react_component components/visualizers/GazeboViewer%}{% end_react_component %}
                         {% end_react_component %}
                 {% end_react_component %}
diff --git a/exercises/templates/exercises/obstacle_avoidance/exercise.html b/exercises/templates/exercises/obstacle_avoidance/exercise.html
index 0699487e7..7d53834fc 100644
--- a/exercises/templates/exercises/obstacle_avoidance/exercise.html
+++ b/exercises/templates/exercises/obstacle_avoidance/exercise.html
@@ -6,7 +6,7 @@
 
 {% block react-content %}
     {% if deployment %}
-        {% react_component exercise/obstacle_avoidance_newmanager/ObstacleAvoidanceRR %}
+        {% react_component exercise/obstacle_avoidance/ObstacleAvoidanceRR %}
             {% react_component components/containers/MaterialBox id="exercise-container" %}
             {% react_component components/common/MainAppBar exerciseName="Obstacle Avoidance" url="https://jderobot.github.io/RoboticsAcademy/exercises/AutonomousCars/obstacle_avoidance"%} 
             {% react_component RA_links/WorldSelectorRA %} {% end_react_component %}  
@@ -20,7 +20,7 @@
                         {% react_component components/visualizers/VncConsoleViewer%}{% end_react_component %}
                         {% end_react_component%}
                         {% react_component components/containers/FlexContainer%} 
-                            {% react_component uniboticsExtra/assets/exercises/obstacle_avoidance_newmanager/SpecificObstacleAvoidance %}{% end_react_component %}
+                            {% react_component uniboticsExtra/assets/exercises/obstacle_avoidance/SpecificObstacleAvoidance %}{% end_react_component %}
                             {% react_component components/visualizers/GazeboViewer%}{% end_react_component %}
                         {% end_react_component %}
                 {% end_react_component %}
@@ -31,7 +31,7 @@
 {% end_react_component %}
     {% end_react_component %}
     {% else %}
-        {% react_component exercise/obstacle_avoidance_newmanager/ObstacleAvoidanceRR %}
+        {% react_component exercise/obstacle_avoidance/ObstacleAvoidanceRR %}
             {% react_component components/wrappers/MaterialBox id="exercise-container" %}
                 {% react_component components/layout_components/MainAppBar exerciseName="Obstacle Avoidance" url="https://jderobot.github.io/RoboticsAcademy/exercises/AutonomousCars/obstacle_avoidance"%} 
                 {% react_component components/visualizers/WorldSelector %} {% end_react_component %}  
@@ -45,7 +45,7 @@
                     {% react_component components/visualizers/ConsoleViewer%}{% end_react_component %}
                         {% end_react_component%}
                         {% react_component components/wrappers/FlexContainer%} 
-                            {% react_component exercise/obstacle_avoidance_newmanager/SpecificObstacleAvoidance %}{% end_react_component %}
+                            {% react_component exercise/obstacle_avoidance/SpecificObstacleAvoidance %}{% end_react_component %}
                             {% react_component components/visualizers/GazeboViewer%}{% end_react_component %}
                         {% end_react_component %}
                 {% end_react_component %}
diff --git a/exercises/templates/exercises/rescue_people/exercise.html b/exercises/templates/exercises/rescue_people/exercise.html
index ecc899677..cda7ee72f 100644
--- a/exercises/templates/exercises/rescue_people/exercise.html
+++ b/exercises/templates/exercises/rescue_people/exercise.html
@@ -6,7 +6,7 @@
 
 {% block react-content %}
     {% if deployment %}
-        {% react_component exercise/rescue_people_newmanager/rescuePeopleRR %}
+        {% react_component exercise/rescue_people/rescuePeopleRR %}
             {% react_component components/containers/MaterialBox id="exercise-container" %}
             {% react_component components/common/MainAppBar exerciseName="Rescue People" url="https://jderobot.github.io/RoboticsAcademy/exercises/Drones/rescue_people"%} 
             {% react_component RA_links/WorldSelectorRA %} {% end_react_component %}  
@@ -20,7 +20,7 @@
                         {% react_component components/visualizers/VncConsoleViewer%}{% end_react_component %}
                         {% end_react_component%}
                         {% react_component components/containers/FlexContainer%} 
-                            {% react_component exercise/rescue_people_newmanager/SpecificRescuePeople %} {% end_react_component %}
+                            {% react_component exercise/rescue_people/SpecificRescuePeople %} {% end_react_component %}
                             {% react_component components/visualizers/GazeboViewer%}{% end_react_component %}
                         {% end_react_component %}
                 {% end_react_component %}
@@ -31,7 +31,7 @@
 {% end_react_component %}
     {% end_react_component %}
     {% else %}
-        {% react_component exercise/rescue_people_newmanager/rescuePeopleRR %}
+        {% react_component exercise/rescue_people/rescuePeopleRR %}
             {% react_component components/wrappers/MaterialBox id="exercise-container" %}
                 {% react_component components/layout_components/MainAppBar exerciseName="Rescue People" url="https://jderobot.github.io/RoboticsAcademy/exercises/Drones/rescue_people"%} 
                 {% react_component components/visualizers/WorldSelector %} {% end_react_component %}  
@@ -45,7 +45,7 @@
                     {% react_component components/visualizers/ConsoleViewer%}{% end_react_component %}
                         {% end_react_component%}
                         {% react_component components/wrappers/FlexContainer%} 
-                            {% react_component exercise/rescue_people_newmanager/SpecificRescuePeople %} {% end_react_component %}
+                            {% react_component exercise/rescue_people/SpecificRescuePeople %} {% end_react_component %}
                             {% react_component components/visualizers/GazeboViewer%}{% end_react_component %}
                         {% end_react_component %}
                 {% end_react_component %}
diff --git a/exercises/templates/exercises/vacuum_cleaner/exercise.html b/exercises/templates/exercises/vacuum_cleaner/exercise.html
index c336474e2..ab3ec7f92 100644
--- a/exercises/templates/exercises/vacuum_cleaner/exercise.html
+++ b/exercises/templates/exercises/vacuum_cleaner/exercise.html
@@ -6,7 +6,7 @@
 
 {% block react-content %}
     {% if deployment %}
-        {% react_component exercise/vacuum_cleaner_newmanager/BasicVacuumCleaner %}
+        {% react_component exercise/vacuum_cleaner/BasicVacuumCleaner %}
             {% react_component components/containers/MaterialBox id="exercise-container" %}
             {% react_component components/common/MainAppBar exerciseName="Basic Vacuum Cleaner" url="https://jderobot.github.io/RoboticsAcademy/exercises/MobileRobots/vacuum_cleaner"%} 
             {% react_component RA_links/WorldSelectorRA %} {% end_react_component %}  
@@ -14,14 +14,14 @@
             {% react_component components/containers/MaterialBox id="content" %}
                 {% react_component components/containers/MaterialBox id="content-exercise" %}
                     {% react_component components/containers/ExerciseControl efficacy %}{% end_react_component %}
-                    {% react_component uniboticsExtra/assets/exercises/vacuum_cleaner_newmanager/GridBasicVacuumCleaner %}{% end_react_component %}
+                    {% react_component uniboticsExtra/assets/exercises/vacuum_cleaner/GridBasicVacuumCleaner %}{% end_react_component %}
                     {% react_component components/containers/FlexContainer row %}
                     {% react_component components/containers/FlexContainer console %} 
                     {% react_component components/editors/EditorRobot %}{% end_react_component %}
                         {% react_component components/visualizers/VncConsoleViewer%}{% end_react_component %}
                         {% end_react_component%}
                         {% react_component components/containers/FlexContainer%}
-                            {% react_component uniboticsExtra/assets/exercises/vacuum_cleaner_newmanager/SpecificVacuumCleaner %}{% end_react_component %}
+                            {% react_component uniboticsExtra/assets/exercises/vacuum_cleaner/SpecificVacuumCleaner %}{% end_react_component %}
                             {% react_component components/visualizers/GazeboViewer%}{% end_react_component %}
                         {% end_react_component %}
                 {% end_react_component %}
@@ -32,7 +32,7 @@
 {% end_react_component %}
     {% end_react_component %}
     {% else %}
-        {% react_component exercise/vacuum_cleaner_newmanager/BasicVacuumCleaner %}
+        {% react_component exercise/vacuum_cleaner/BasicVacuumCleaner %}
             {% react_component components/wrappers/MaterialBox id="exercise-container" %}
                 {% react_component components/layout_components/MainAppBar exerciseName="Basic Vacuum Cleaner" url="https://jderobot.github.io/RoboticsAcademy/exercises/MobileRobots/vacuum_cleaner"%} 
                 {% react_component components/visualizers/WorldSelector %} {% end_react_component %}  
@@ -46,7 +46,7 @@
                     {% react_component components/visualizers/ConsoleViewer%}{% end_react_component %}
                         {% end_react_component%}
                         {% react_component components/wrappers/FlexContainer%} 
-                            {% react_component exercise/vacuum_cleaner_newmanager/SpecificVacuumCleaner %}{% end_react_component %}
+                            {% react_component exercise/vacuum_cleaner/SpecificVacuumCleaner %}{% end_react_component %}
                             {% react_component components/visualizers/GazeboViewer%}{% end_react_component %}
                         {% end_react_component %}
                 {% end_react_component %}
diff --git a/exercises/templates/exercises/vacuum_cleaner_loc/exercise.html b/exercises/templates/exercises/vacuum_cleaner_loc/exercise.html
index b339ea1aa..abe1f3596 100644
--- a/exercises/templates/exercises/vacuum_cleaner_loc/exercise.html
+++ b/exercises/templates/exercises/vacuum_cleaner_loc/exercise.html
@@ -6,7 +6,7 @@
 
 {% block react-content %}
     {% if deployment %}
-        {% react_component exercise/vacuum_cleaner_loc_newmanager/LocVacuumCleaner %}
+        {% react_component exercise/vacuum_cleaner_loc/LocVacuumCleaner %}
             {% react_component components/containers/MaterialBox id="exercise-container" %}
             {% react_component components/common/MainAppBar exerciseName="Localized Vacuum Cleaner" url="https://jderobot.github.io/RoboticsAcademy/exercises/MobileRobots/vacuum_cleaner_loc"%} 
             {% react_component RA_links/WorldSelectorRA %} {% end_react_component %}  
@@ -14,14 +14,14 @@
             {% react_component components/containers/MaterialBox id="content" %}
                 {% react_component components/containers/MaterialBox id="content-exercise" %}
                     {% react_component components/containers/ExerciseControl efficacy %}{% end_react_component %}
-                    {% react_component uniboticsExtra/assets/exercises/vacuum_cleaner_loc_newmanager/GridLocVacuumCleaner %}{% end_react_component %}
+                    {% react_component uniboticsExtra/assets/exercises/vacuum_cleaner_loc/GridLocVacuumCleaner %}{% end_react_component %}
                     {% react_component components/containers/FlexContainer row %}
                     {% react_component components/containers/FlexContainer console %} 
                     {% react_component components/editors/EditorRobot %}{% end_react_component %}
                         {% react_component components/visualizers/VncConsoleViewer%}{% end_react_component %}
                         {% end_react_component%}
                         {% react_component components/containers/FlexContainer%} 
-                            {% react_component uniboticsExtra/assets/exercises/vacuum_cleaner_loc_newmanager/SpecificLocVacuumCleaner %}{% end_react_component %}
+                            {% react_component uniboticsExtra/assets/exercises/vacuum_cleaner_loc/SpecificLocVacuumCleaner %}{% end_react_component %}
                             {% react_component components/visualizers/GazeboViewer%}{% end_react_component %}
                         {% end_react_component %}
                 {% end_react_component %}
@@ -32,7 +32,7 @@
 {% end_react_component %}
     {% end_react_component %}
     {% else %}
-        {% react_component exercise/vacuum_cleaner_loc_newmanager/LocVacuumCleaner %}
+        {% react_component exercise/vacuum_cleaner_loc/LocVacuumCleaner %}
             {% react_component components/wrappers/MaterialBox id="exercise-container" %}
                 {% react_component components/layout_components/MainAppBar exerciseName="Localized Vacuum Cleaner" url="https://jderobot.github.io/RoboticsAcademy/exercises/MobileRobots/vacuum_cleaner_loc"%} 
                 {% react_component components/visualizers/WorldSelector %} {% end_react_component %}  
@@ -46,7 +46,7 @@
                     {% react_component components/visualizers/ConsoleViewer%}{% end_react_component %}
                         {% end_react_component%}
                         {% react_component components/wrappers/FlexContainer%} 
-                            {% react_component exercise/vacuum_cleaner_loc_newmanager/SpecificLocVacuumCleaner %}{% end_react_component %}
+                            {% react_component exercise/vacuum_cleaner_loc/SpecificLocVacuumCleaner %}{% end_react_component %}
                             {% react_component components/visualizers/GazeboViewer%}{% end_react_component %}
                         {% end_react_component %}
                 {% end_react_component %}