diff --git a/include/openspace/interaction/interactionhandler.h b/include/openspace/interaction/interactionhandler.h
index 2863271efe..59fefaa4f9 100644
--- a/include/openspace/interaction/interactionhandler.h
+++ b/include/openspace/interaction/interactionhandler.h
@@ -39,7 +39,8 @@
 namespace openspace::interaction {
 
 /**
- * TODO
+ * This handler is responsible for keeping track of the different input states provided
+ * through the software's interaction system.
  */
 class InteractionHandler: public properties::PropertyOwner {
 public:
diff --git a/include/openspace/interaction/keyboardinputstate.h b/include/openspace/interaction/keyboardinputstate.h
index 8ea75ab294..0dafd85619 100644
--- a/include/openspace/interaction/keyboardinputstate.h
+++ b/include/openspace/interaction/keyboardinputstate.h
@@ -31,19 +31,18 @@
 
 namespace openspace::interaction {
 
-// This class represents the global input state of interaction devices
+/**
+ * This class represents the global input state of keyboard interaction devices.
+ */
 class KeyboardInputState {
 public:
-    // Callback functions
     void keyboardCallback(Key key, KeyModifier modifier, KeyAction action);
 
-    // Accessors
     const std::vector<std::pair<Key, KeyModifier>>& pressedKeys() const;
     bool isKeyPressed(std::pair<Key, KeyModifier> keyModPair) const;
     bool isKeyPressed(Key key) const;
 
 private:
-    // Input from keyboard
     std::vector<std::pair<Key, KeyModifier>> _keysDown;
 };
 
diff --git a/include/openspace/interaction/mouseinputstate.h b/include/openspace/interaction/mouseinputstate.h
index 0c7aaef1bc..f8a0b271c3 100644
--- a/include/openspace/interaction/mouseinputstate.h
+++ b/include/openspace/interaction/mouseinputstate.h
@@ -31,22 +31,21 @@
 
 namespace openspace::interaction {
 
-// This class represents the global input state of interaction devices
+/**
+ * This class represents the global input state of mouse interaction devices.
+ */
 class MouseInputState {
 public:
-    // Callback functions
     void mouseButtonCallback(MouseButton button, MouseAction action);
     void mousePositionCallback(double mouseX, double mouseY);
     void mouseScrollWheelCallback(double mouseScrollDelta);
 
-    // Accessors
     const std::vector<MouseButton>& pressedMouseButtons() const;
     glm::dvec2 mousePosition() const;
     double mouseScrollDelta() const;
     bool isMouseButtonPressed(MouseButton mouseButton) const;
 
 private:
-    // Input from mouse
     std::vector<MouseButton> _mouseButtonsDown;
     glm::dvec2 _mousePosition = glm::dvec2(0.0);
     double _mouseScrollDelta = 0.0;
diff --git a/include/openspace/navigation/orbitalnavigator/orbitalnavigator.h b/include/openspace/navigation/orbitalnavigator/orbitalnavigator.h
index 54e5f37e70..f374ce9b7c 100644
--- a/include/openspace/navigation/orbitalnavigator/orbitalnavigator.h
+++ b/include/openspace/navigation/orbitalnavigator/orbitalnavigator.h
@@ -27,13 +27,13 @@
 
 #include <openspace/properties/propertyowner.h>
 
-#include <openspace/interaction/interpolator.h>
 #include <openspace/navigation/orbitalnavigator/orbitalinputhandler.h>
 #include <openspace/properties/misc/optionproperty.h>
 #include <openspace/properties/misc/stringproperty.h>
 #include <openspace/properties/misc/triggerproperty.h>
 #include <openspace/properties/scalar/boolproperty.h>
 #include <openspace/properties/scalar/floatproperty.h>
+#include <openspace/util/interpolator.h>
 #include <openspace/util/syncdata.h>
 #include <ghoul/glm.h>
 #include <optional>
diff --git a/include/openspace/interaction/interpolator.h b/include/openspace/util/interpolator.h
similarity index 100%
rename from include/openspace/interaction/interpolator.h
rename to include/openspace/util/interpolator.h
diff --git a/include/openspace/interaction/interpolator.inl b/include/openspace/util/interpolator.inl
similarity index 100%
rename from include/openspace/interaction/interpolator.inl
rename to include/openspace/util/interpolator.inl
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f7941ffd62..15b85297cd 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -254,8 +254,6 @@ set(OPENSPACE_HEADER
   ${PROJECT_SOURCE_DIR}/include/openspace/interaction/actionmanager.h
   ${PROJECT_SOURCE_DIR}/include/openspace/interaction/interactionhandler.h
   ${PROJECT_SOURCE_DIR}/include/openspace/interaction/interactionmonitor.h
-  ${PROJECT_SOURCE_DIR}/include/openspace/interaction/interpolator.h
-  ${PROJECT_SOURCE_DIR}/include/openspace/interaction/interpolator.inl
   ${PROJECT_SOURCE_DIR}/include/openspace/interaction/joystickinputstate.h
   ${PROJECT_SOURCE_DIR}/include/openspace/interaction/keybindingmanager.h
   ${PROJECT_SOURCE_DIR}/include/openspace/interaction/keyboardinputstate.h
@@ -386,6 +384,8 @@ set(OPENSPACE_HEADER
   ${PROJECT_SOURCE_DIR}/include/openspace/util/factorymanager.inl
   ${PROJECT_SOURCE_DIR}/include/openspace/util/geodetic.h
   ${PROJECT_SOURCE_DIR}/include/openspace/util/httprequest.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/util/interpolator.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/util/interpolator.inl
   ${PROJECT_SOURCE_DIR}/include/openspace/util/job.h
   ${PROJECT_SOURCE_DIR}/include/openspace/util/json_helper.h
   ${PROJECT_SOURCE_DIR}/include/openspace/util/json_helper.inl