diff --git a/electives/others/amr/assets/dc-motor.png b/electives/amr/assets/dc-motor.png similarity index 100% rename from electives/others/amr/assets/dc-motor.png rename to electives/amr/assets/dc-motor.png diff --git a/electives/others/amr/assets/inverse-kinematics.png b/electives/amr/assets/inverse-kinematics.png similarity index 100% rename from electives/others/amr/assets/inverse-kinematics.png rename to electives/amr/assets/inverse-kinematics.png diff --git a/electives/others/amr/assets/rigid-body-6d.png b/electives/amr/assets/rigid-body-6d.png similarity index 100% rename from electives/others/amr/assets/rigid-body-6d.png rename to electives/amr/assets/rigid-body-6d.png diff --git a/electives/others/amr/assets/wheel-config.png b/electives/amr/assets/wheel-config.png similarity index 100% rename from electives/others/amr/assets/wheel-config.png rename to electives/amr/assets/wheel-config.png diff --git a/electives/others/amr/assets/wheel-constraints.png b/electives/amr/assets/wheel-constraints.png similarity index 100% rename from electives/others/amr/assets/wheel-constraints.png rename to electives/amr/assets/wheel-constraints.png diff --git a/electives/others/amr/autonomous-mobile-robots-cheatsheet.pdf b/electives/amr/autonomous-mobile-robots-cheatsheet.pdf similarity index 100% rename from electives/others/amr/autonomous-mobile-robots-cheatsheet.pdf rename to electives/amr/autonomous-mobile-robots-cheatsheet.pdf diff --git a/electives/others/amr/autonomous-mobile-robots-cheatsheet.tex b/electives/amr/autonomous-mobile-robots-cheatsheet.tex similarity index 100% rename from electives/others/amr/autonomous-mobile-robots-cheatsheet.tex rename to electives/amr/autonomous-mobile-robots-cheatsheet.tex diff --git a/electives/others/amr/parts/00_basics/00_probability.tex b/electives/amr/parts/00_basics/00_probability.tex similarity index 100% rename from electives/others/amr/parts/00_basics/00_probability.tex rename to electives/amr/parts/00_basics/00_probability.tex diff --git a/electives/others/amr/parts/00_basics/01_measurement-models.tex b/electives/amr/parts/00_basics/01_measurement-models.tex similarity index 100% rename from electives/others/amr/parts/00_basics/01_measurement-models.tex rename to electives/amr/parts/00_basics/01_measurement-models.tex diff --git a/electives/others/amr/parts/00_basics/02_trigonometry.tex b/electives/amr/parts/00_basics/02_trigonometry.tex similarity index 100% rename from electives/others/amr/parts/00_basics/02_trigonometry.tex rename to electives/amr/parts/00_basics/02_trigonometry.tex diff --git a/electives/others/amr/parts/01_kinematics/00_intro.tex b/electives/amr/parts/01_kinematics/00_intro.tex similarity index 100% rename from electives/others/amr/parts/01_kinematics/00_intro.tex rename to electives/amr/parts/01_kinematics/00_intro.tex diff --git a/electives/others/amr/parts/01_kinematics/01_forward.tex b/electives/amr/parts/01_kinematics/01_forward.tex similarity index 100% rename from electives/others/amr/parts/01_kinematics/01_forward.tex rename to electives/amr/parts/01_kinematics/01_forward.tex diff --git a/electives/others/amr/parts/01_kinematics/02_inverse.tex b/electives/amr/parts/01_kinematics/02_inverse.tex similarity index 100% rename from electives/others/amr/parts/01_kinematics/02_inverse.tex rename to electives/amr/parts/01_kinematics/02_inverse.tex diff --git a/electives/others/amr/parts/01_kinematics/03_temporal-models.tex b/electives/amr/parts/01_kinematics/03_temporal-models.tex similarity index 100% rename from electives/others/amr/parts/01_kinematics/03_temporal-models.tex rename to electives/amr/parts/01_kinematics/03_temporal-models.tex diff --git a/electives/others/amr/parts/01_kinematics/04_rigid-body-imu-kinematics.tex b/electives/amr/parts/01_kinematics/04_rigid-body-imu-kinematics.tex similarity index 100% rename from electives/others/amr/parts/01_kinematics/04_rigid-body-imu-kinematics.tex rename to electives/amr/parts/01_kinematics/04_rigid-body-imu-kinematics.tex diff --git a/electives/others/amr/parts/01_kinematics/05_rigid-body-dynamics.tex b/electives/amr/parts/01_kinematics/05_rigid-body-dynamics.tex similarity index 100% rename from electives/others/amr/parts/01_kinematics/05_rigid-body-dynamics.tex rename to electives/amr/parts/01_kinematics/05_rigid-body-dynamics.tex diff --git a/electives/others/amr/parts/01_kinematics/06_wheeled-robot.tex b/electives/amr/parts/01_kinematics/06_wheeled-robot.tex similarity index 100% rename from electives/others/amr/parts/01_kinematics/06_wheeled-robot.tex rename to electives/amr/parts/01_kinematics/06_wheeled-robot.tex diff --git a/electives/others/amr/parts/02_Sensors-Actuators/00_intro.tex b/electives/amr/parts/02_Sensors-Actuators/00_intro.tex similarity index 100% rename from electives/others/amr/parts/02_Sensors-Actuators/00_intro.tex rename to electives/amr/parts/02_Sensors-Actuators/00_intro.tex diff --git a/electives/others/amr/parts/02_Sensors-Actuators/01_gps.tex b/electives/amr/parts/02_Sensors-Actuators/01_gps.tex similarity index 100% rename from electives/others/amr/parts/02_Sensors-Actuators/01_gps.tex rename to electives/amr/parts/02_Sensors-Actuators/01_gps.tex diff --git a/electives/others/amr/parts/02_Sensors-Actuators/02_actuators.tex b/electives/amr/parts/02_Sensors-Actuators/02_actuators.tex similarity index 100% rename from electives/others/amr/parts/02_Sensors-Actuators/02_actuators.tex rename to electives/amr/parts/02_Sensors-Actuators/02_actuators.tex diff --git a/electives/others/amr/parts/02_Sensors-Actuators/03_cameras.tex b/electives/amr/parts/02_Sensors-Actuators/03_cameras.tex similarity index 100% rename from electives/others/amr/parts/02_Sensors-Actuators/03_cameras.tex rename to electives/amr/parts/02_Sensors-Actuators/03_cameras.tex diff --git a/electives/others/amr/parts/02_Sensors-Actuators/04_depth-range.tex b/electives/amr/parts/02_Sensors-Actuators/04_depth-range.tex similarity index 100% rename from electives/others/amr/parts/02_Sensors-Actuators/04_depth-range.tex rename to electives/amr/parts/02_Sensors-Actuators/04_depth-range.tex diff --git a/electives/others/amr/parts/03_multi-sensor-estimation/00_linearization.tex b/electives/amr/parts/03_multi-sensor-estimation/00_linearization.tex similarity index 100% rename from electives/others/amr/parts/03_multi-sensor-estimation/00_linearization.tex rename to electives/amr/parts/03_multi-sensor-estimation/00_linearization.tex diff --git a/electives/others/amr/parts/03_multi-sensor-estimation/01_least-squares.tex b/electives/amr/parts/03_multi-sensor-estimation/01_least-squares.tex similarity index 100% rename from electives/others/amr/parts/03_multi-sensor-estimation/01_least-squares.tex rename to electives/amr/parts/03_multi-sensor-estimation/01_least-squares.tex diff --git a/electives/others/amr/parts/03_multi-sensor-estimation/02_nonlinear-least-squares.tex b/electives/amr/parts/03_multi-sensor-estimation/02_nonlinear-least-squares.tex similarity index 100% rename from electives/others/amr/parts/03_multi-sensor-estimation/02_nonlinear-least-squares.tex rename to electives/amr/parts/03_multi-sensor-estimation/02_nonlinear-least-squares.tex diff --git a/electives/others/amr/parts/03_multi-sensor-estimation/03_bayes-filters.tex b/electives/amr/parts/03_multi-sensor-estimation/03_bayes-filters.tex similarity index 100% rename from electives/others/amr/parts/03_multi-sensor-estimation/03_bayes-filters.tex rename to electives/amr/parts/03_multi-sensor-estimation/03_bayes-filters.tex diff --git a/electives/others/amr/parts/03_multi-sensor-estimation/04_particle-filter.tex b/electives/amr/parts/03_multi-sensor-estimation/04_particle-filter.tex similarity index 100% rename from electives/others/amr/parts/03_multi-sensor-estimation/04_particle-filter.tex rename to electives/amr/parts/03_multi-sensor-estimation/04_particle-filter.tex diff --git a/electives/others/amr/parts/03_multi-sensor-estimation/05_kalman-filter.tex b/electives/amr/parts/03_multi-sensor-estimation/05_kalman-filter.tex similarity index 100% rename from electives/others/amr/parts/03_multi-sensor-estimation/05_kalman-filter.tex rename to electives/amr/parts/03_multi-sensor-estimation/05_kalman-filter.tex diff --git a/electives/others/amr/parts/03_multi-sensor-estimation/06_extended-kalman-filter.tex b/electives/amr/parts/03_multi-sensor-estimation/06_extended-kalman-filter.tex similarity index 100% rename from electives/others/amr/parts/03_multi-sensor-estimation/06_extended-kalman-filter.tex rename to electives/amr/parts/03_multi-sensor-estimation/06_extended-kalman-filter.tex diff --git a/electives/others/amr/parts/04_vision/00_keypoints.tex b/electives/amr/parts/04_vision/00_keypoints.tex similarity index 100% rename from electives/others/amr/parts/04_vision/00_keypoints.tex rename to electives/amr/parts/04_vision/00_keypoints.tex diff --git a/electives/others/amr/parts/04_vision/01_bootstrapping.tex b/electives/amr/parts/04_vision/01_bootstrapping.tex similarity index 100% rename from electives/others/amr/parts/04_vision/01_bootstrapping.tex rename to electives/amr/parts/04_vision/01_bootstrapping.tex diff --git a/electives/others/amr/parts/04_vision/02_place-recognition.tex b/electives/amr/parts/04_vision/02_place-recognition.tex similarity index 100% rename from electives/others/amr/parts/04_vision/02_place-recognition.tex rename to electives/amr/parts/04_vision/02_place-recognition.tex diff --git a/electives/others/amr/parts/04_vision/03_mapping.tex b/electives/amr/parts/04_vision/03_mapping.tex similarity index 100% rename from electives/others/amr/parts/04_vision/03_mapping.tex rename to electives/amr/parts/04_vision/03_mapping.tex diff --git a/electives/others/amr/parts/04_vision/04_dense-tracking_loop-closure.tex b/electives/amr/parts/04_vision/04_dense-tracking_loop-closure.tex similarity index 100% rename from electives/others/amr/parts/04_vision/04_dense-tracking_loop-closure.tex rename to electives/amr/parts/04_vision/04_dense-tracking_loop-closure.tex diff --git a/electives/others/amr/parts/05_planning-control/00_feedback-control/00_siso-mimo.tex b/electives/amr/parts/05_planning-control/00_feedback-control/00_siso-mimo.tex similarity index 100% rename from electives/others/amr/parts/05_planning-control/00_feedback-control/00_siso-mimo.tex rename to electives/amr/parts/05_planning-control/00_feedback-control/00_siso-mimo.tex diff --git a/electives/others/amr/parts/05_planning-control/01_motion-planning-exploration/00_intro.tex b/electives/amr/parts/05_planning-control/01_motion-planning-exploration/00_intro.tex similarity index 100% rename from electives/others/amr/parts/05_planning-control/01_motion-planning-exploration/00_intro.tex rename to electives/amr/parts/05_planning-control/01_motion-planning-exploration/00_intro.tex diff --git a/electives/others/vr1/parts/00_intro.tex b/electives/vr1/parts/00_intro.tex similarity index 100% rename from electives/others/vr1/parts/00_intro.tex rename to electives/vr1/parts/00_intro.tex diff --git a/electives/others/vr1/virtual-reality1-summary.pdf b/electives/vr1/virtual-reality1-summary.pdf similarity index 100% rename from electives/others/vr1/virtual-reality1-summary.pdf rename to electives/vr1/virtual-reality1-summary.pdf diff --git a/electives/others/vr1/virtual-reality1-summary.tex b/electives/vr1/virtual-reality1-summary.tex similarity index 100% rename from electives/others/vr1/virtual-reality1-summary.tex rename to electives/vr1/virtual-reality1-summary.tex