diff --git a/moveit_ros/moveit_servo/include/moveit_servo/servo.hpp b/moveit_ros/moveit_servo/include/moveit_servo/servo.hpp
new file mode 100644
index 0000000000..c4596711e5
--- /dev/null
+++ b/moveit_ros/moveit_servo/include/moveit_servo/servo.hpp
@@ -0,0 +1,253 @@
+/*******************************************************************************
+ * BSD 3-Clause License
+ *
+ * Copyright (c) 2019, Los Alamos National Security, LLC
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *******************************************************************************/
+
+/*      Title       : servo.hpp
+ *      Project     : moveit_servo
+ *      Created     : 05/17/2023
+ *      Author      : Brian O'Neil, Andy Zelenak, Blake Anderson, V Mohammed Ibrahim
+ *
+ *      Description : The core servoing logic.
+ */
+
+#pragma once
+
+#include <rclcpp/logger.hpp>
+#include <rclcpp/version.h>
+
+#include <moveit_servo/collision_monitor.hpp>
+#include <moveit_servo/moveit_servo_lib_parameters.hpp>
+#include <moveit_servo/utils/command.hpp>
+#include <moveit_servo/utils/datatypes.hpp>
+#include <moveit/kinematics_base/kinematics_base.hpp>
+#include <moveit/online_signal_smoothing/smoothing_base_class.hpp>
+#include <moveit/planning_scene_monitor/planning_scene_monitor.hpp>
+#include <pluginlib/class_loader.hpp>
+#include <sensor_msgs/msg/joint_state.hpp>
+#include <tf2_eigen/tf2_eigen.hpp>
+// For Rolling, Kilted, and newer
+#if RCLCPP_VERSION_GTE(29, 6, 0)
+#include <tf2_ros/transform_listener.hpp>
+// For Jazzy and older
+#else
+#include <tf2_ros/transform_listener.h>
+#endif
+#include <variant>
+#include <queue>
+
+namespace moveit_servo
+{
+
+class Servo
+{
+public:
+  Servo(const rclcpp::Node::SharedPtr& node, std::shared_ptr<const servo::ParamListener> servo_param_listener,
+        const planning_scene_monitor::PlanningSceneMonitorPtr& planning_scene_monitor);
+
+  ~Servo();
+
+  // Disable copy construction.
+  Servo(const Servo&) = delete;
+
+  // Disable copy assignment.
+  Servo& operator=(Servo&) = delete;
+
+  /**
+   * \brief Computes the joint state required to follow the given command.
+   * @param robot_state RobotStatePtr instance used for calculating the next joint state.
+   * @param command The command to follow, std::variant type, can handle JointJog, Twist and Pose.
+   * @return The required joint state.
+   */
+  KinematicState getNextJointState(const moveit::core::RobotStatePtr& robot_state, const ServoInput& command);
+
+  /**
+   * \brief Set the type of incoming servo command.
+   * @param command_type The type of command servo should expect.
+   */
+  void setCommandType(const CommandType& command_type);
+
+  /**
+   * \brief Get the type of command that servo is currently expecting.
+   * @return The type of command.
+   */
+  CommandType getCommandType() const;
+
+  /**
+   * \brief Get the current status of servo.
+   * @return The current status.
+   */
+  StatusCode getStatus() const;
+
+  /**
+   * \brief Get the message associated with the current servo status.
+   * @return The status message.
+   */
+  std::string getStatusMessage() const;
+
+  /**
+   * \brief Start/Stop collision checking thread.
+   * @param check_collision Stops collision checking thread if false, starts it if true.
+   */
+  void setCollisionChecking(const bool check_collision);
+
+  /**
+   * \brief Returns the most recent servo parameters.
+   * @return The servo parameters.
+   */
+  servo::Params& getParams();
+
+  /**
+   * \brief Get the current state of the robot as given by planning scene monitor.
+   * This may block if a current robot state is not available immediately.
+   * @param block_for_current_state If true, we explicitly wait for a new robot state
+   * @return The current state of the robot.
+   */
+  KinematicState getCurrentRobotState(bool block_for_current_state) const;
+
+  /**
+   * \brief Smoothly halt at a commanded state when command goes stale.
+   * @param halt_state The desired halting state.
+   * @return A pair where the first element is a Boolean indicating whether the robot has stopped, and the second is a
+   * state stepping towards the desired halting state.
+   */
+  std::pair<bool, KinematicState> smoothHalt(const KinematicState& halt_state);
+
+  /**
+   * \brief Applies smoothing to an input state, if a smoothing plugin is set.
+   * @param state The state to be updated by the smoothing plugin.
+   */
+  void doSmoothing(KinematicState& state);
+
+  /**
+   * \brief Resets the smoothing plugin, if set, to a specified state.
+   * @param state The desired state to reset the smoothing plugin to.
+   */
+  void resetSmoothing(const KinematicState& state);
+
+private:
+  /**
+   * \brief Finds the transform from the planning frame to a specified command frame.
+   * If the command frame is part of the robot model, directly look up the transform using the robot model.
+   * Else, fall back to using TF to look up the transform.
+   * @param command_frame The command frame name.
+   * @param planning_frame The planning frame name.
+   * @return The transformation between planning frame and command frame, or std::nullopt if there was a failure looking
+   * up a transform.
+   */
+  std::optional<Eigen::Isometry3d> getPlanningToCommandFrameTransform(const std::string& command_frame,
+                                                                      const std::string& planning_frame) const;
+
+  /**
+   * \brief Convert a given twist command to planning frame,
+   * The command frame specified by `command.frame_id` is expected to be a stationary frame or end-effector frame.
+   * References:
+   * https://core.ac.uk/download/pdf/154240607.pdf
+   * https://www.seas.upenn.edu/~meam520/notes02/Forces8.pdf
+   * @param command The twist command to be converted.
+   * @param planning_frame The name of the planning frame.
+   * @return The transformed twist command.
+   */
+  std::optional<TwistCommand> toPlanningFrame(const TwistCommand& command, const std::string& planning_frame) const;
+
+  /**
+   * \brief Convert a given pose command to planning frame
+   * @param command The pose command to be converted.
+   * @param planning_frame The name of the planning frame.
+   * @return The transformed pose command.
+   */
+  std::optional<PoseCommand> toPlanningFrame(const PoseCommand& command, const std::string& planning_frame) const;
+
+  /**
+   * \brief Compute the change in joint position required to follow the received command.
+   * @param command The incoming servo command.
+   * @param robot_state RobotStatePtr instance used for calculating the command.
+   * @return The joint position change required (delta).
+   */
+  Eigen::VectorXd jointDeltaFromCommand(const ServoInput& command, const moveit::core::RobotStatePtr& robot_state);
+
+  /**
+   * \brief Validate the servo parameters
+   * @param servo_params The servo parameters
+   * @return True if parameters are valid, else False
+   */
+  bool validateParams(const servo::Params& servo_params);
+
+  /**
+   * \brief Updates the servo parameters and performs validations.
+   */
+  bool updateParams();
+
+  /**
+   * \brief Create and initialize the smoothing plugin to be used by servo.
+   */
+  void setSmoothingPlugin();
+
+  /**
+   * \brief Apply halting logic to specified joints.
+   * @param joints_to_halt The indices of joints to be halted.
+   * @param current_state The current kinematic state.
+   * @param target_state The target kinematic state.
+   * @return The bounded kinematic state.
+   */
+  KinematicState haltJoints(const std::vector<size_t>& joints_to_halt, const KinematicState& current_state,
+                            const KinematicState& target_state) const;
+
+  // Variables
+
+  StatusCode servo_status_;
+  // This needs to be threadsafe so it can be updated in realtime.
+  std::atomic<CommandType> expected_command_type_;
+
+  servo::Params servo_params_;
+  const rclcpp::Node::SharedPtr node_;
+  rclcpp::Logger logger_;
+  std::shared_ptr<const servo::ParamListener> servo_param_listener_;
+  planning_scene_monitor::PlanningSceneMonitorPtr planning_scene_monitor_;
+
+  // This value will be updated by CollisionMonitor in a separate thread.
+  std::atomic<double> collision_velocity_scale_ = 1.0;
+  std::unique_ptr<CollisionMonitor> collision_monitor_;
+
+  // Plugin loader
+  std::unique_ptr<pluginlib::ClassLoader<online_signal_smoothing::SmoothingBaseClass>> smoother_loader_;
+
+  // Pointer to the (optional) smoothing plugin.
+  pluginlib::UniquePtr<online_signal_smoothing::SmoothingBaseClass> smoother_ = nullptr;
+
+  // Map between joint subgroup names and corresponding joint name - move group indices map
+  std::unordered_map<std::string, JointNameToMoveGroupIndexMap> joint_name_to_index_maps_;
+
+  // The current joint limit safety margins for each active joint position variable.
+  std::vector<double> joint_limit_margins_;
+};
+
+}  // namespace moveit_servo
diff --git a/moveit_ros/moveit_servo/src/servo.cpp b/moveit_ros/moveit_servo/src/servo.cpp
index b148ac1af4..67358d7d79 100644
--- a/moveit_ros/moveit_servo/src/servo.cpp
+++ b/moveit_ros/moveit_servo/src/servo.cpp
@@ -83,8 +83,34 @@ Servo::~Servo()
 
 void Servo::setPaused(bool paused)
 {
+<<<<<<< HEAD
   servo_calcs_.setPaused(paused);
   collision_checker_.setPaused(paused);
+=======
+  // Load the smoothing plugin
+  try
+  {
+    smoother_loader_ = std::make_unique<pluginlib::ClassLoader<online_signal_smoothing::SmoothingBaseClass>>(
+        "moveit_core", "online_signal_smoothing::SmoothingBaseClass");
+    smoother_ = smoother_loader_->createUniqueInstance(servo_params_.smoothing_filter_plugin_name);
+  }
+  catch (pluginlib::PluginlibException& ex)
+  {
+    RCLCPP_ERROR(logger_, "Exception while loading the smoothing plugin '%s': '%s'",
+                 servo_params_.smoothing_filter_plugin_name.c_str(), ex.what());
+    std::exit(EXIT_FAILURE);
+  }
+
+  // Initialize the smoothing plugin
+  moveit::core::RobotStatePtr robot_state = planning_scene_monitor_->getStateMonitor()->getCurrentState();
+  const int num_joints =
+      robot_state->getJointModelGroup(servo_params_.move_group_name)->getActiveJointModelNames().size();
+  if (!smoother_->initialize(node_, planning_scene_monitor_->getRobotModel(), num_joints))
+  {
+    RCLCPP_ERROR(logger_, "Smoothing plugin could not be initialized");
+    std::exit(EXIT_FAILURE);
+  }
+>>>>>>> 92654dd1b (Fix severe warning from class loader in servo (#3577))
 }
 
 bool Servo::getCommandFrameTransform(Eigen::Isometry3d& transform)