diff --git a/data/assets/default.scene b/data/assets/default.scene
index 364d38fcab..af3d3ae439 100644
--- a/data/assets/default.scene
+++ b/data/assets/default.scene
@@ -1,5 +1,6 @@
 local assetHelper = asset.require('util/asset_helper')
 local sceneHelper = asset.require('util/scene_helper')
+local propertyHelper = asset.require('util/property_helper')
 
 -- Specifying which other assets should be loaded in this scene
 asset.require('spice/base')
@@ -18,31 +19,31 @@ asset.request('customization/globebrowsing')
 local Keybindings = {
     {
         Key = "s",
-        Command = sceneHelper.property.invert('Earth.RenderableGlobe.Layers.NightLayers.Earth at Night 2012.Enabled') ..
-                  sceneHelper.property.invert('Earth.RenderableGlobe.PerformShading') ..
-                  sceneHelper.property.invert('Earth.RenderableGlobe.Atmosphere') ..
-                  sceneHelper.property.invert('Earth.RenderableGlobe.Layers.WaterMasks.MODIS_Water_Mask.Enabled'),
+        Command = propertyHelper.invert('Scene.Earth.RenderableGlobe.Layers.NightLayers.Earth at Night 2012.Enabled') ..
+                  propertyHelper.invert('Scene.Earth.RenderableGlobe.PerformShading') ..
+                  propertyHelper.invert('Scene.Earth.RenderableGlobe.Atmosphere') ..
+                  propertyHelper.invert('Scene.Earth.RenderableGlobe.Layers.WaterMasks.MODIS_Water_Mask.Enabled'),
         Documentation = "Toggle night texture, shading, atmosphere, and water for Earth.",
         Local = false
     },
     {
         Key = "b",
-        Command = sceneHelper.property.invert('MilkyWay.renderable.Enabled') ..
-                  sceneHelper.property.invert('Stars.renderable.Enabled'),
+        Command = propertyHelper.invert('Scene.MilkyWay.renderable.Enabled') ..
+                  propertyHelper.invert('Scene.Stars.renderable.Enabled'),
         Documentation = "Toggle background (Stars and Milkyway).",
         Local = false
     },
     {
         Key = "g",
-        Command = sceneHelper.property.invert('MilkyWay.renderable.Enabled') ..
-                  sceneHelper.property.invert('Stars.renderable.Enabled') ..
-                  sceneHelper.property.invert('Earth.RenderableGlobe.Layers.NightLayers.Earth at Night 2012.Enabled') ..
-                  sceneHelper.property.invert('Earth.RenderableGlobe.PerformShading') ..
-                  sceneHelper.property.invert('Mars.RenderableGlobe.PerformShading') ..
-                  sceneHelper.property.invert('Earth.RenderableGlobe.Atmosphere') ..
-                  sceneHelper.property.invert('Earth.RenderableGlobe.Layers.WaterMasks.MODIS_Water_Mask.Enabled') ..
-                  sceneHelper.property.invert('Moon.RenderableGlobe.Enabled') ..
-                  sceneHelper.property.invert('Sun.renderable.Enabled'),
+        Command = propertyHelper.invert('Scene.MilkyWay.renderable.Enabled') ..
+                  propertyHelper.invert('Scene.Stars.renderable.Enabled') ..
+                  propertyHelper.invert('Scene.Earth.RenderableGlobe.Layers.NightLayers.Earth at Night 2012.Enabled') ..
+                  propertyHelper.invert('Scene.Earth.RenderableGlobe.PerformShading') ..
+                  propertyHelper.invert('Scene.Mars.RenderableGlobe.PerformShading') ..
+                  propertyHelper.invert('Scene.Earth.RenderableGlobe.Atmosphere') ..
+                  propertyHelper.invert('Scene.Earth.RenderableGlobe.Layers.WaterMasks.MODIS_Water_Mask.Enabled') ..
+                  propertyHelper.invert('Scene.Moon.RenderableGlobe.Enabled') ..
+                  propertyHelper.invert('Scene.Sun.renderable.Enabled'),
         Documentation = "Toogles background and shading mode on the Earth and Mars alongside visibility of the Moon and the Sun",
         Local = false
     },
diff --git a/data/assets/newhorizons.scene b/data/assets/newhorizons.scene
index fb2e606c93..3b109a3a34 100644
--- a/data/assets/newhorizons.scene
+++ b/data/assets/newhorizons.scene
@@ -1,5 +1,7 @@
 local assetHelper = asset.require('util/asset_helper')
 local sceneHelper = asset.require('util/scene_helper')
+local propertyHelper = asset.require('util/property_helper')
+local renderableHelper = asset.require('util/renderable_helper')
 
 -- Specifying which other assets should be loaded in this scene
 asset.require('spice/base')
@@ -34,94 +36,94 @@ local Keybindings = {
     },
     {
         Key = "F8",
-        Command = "openspace.setPropertyValue('Pluto.renderable.ProjectionComponent.ClearAllProjections', true);" ..
-                  "openspace.setPropertyValue('Charon.renderable.ProjectionComponent.ClearAllProjections', true);",
+        Command = "openspace.setPropertyValue('Scene.Pluto.renderable.ProjectionComponent.ClearAllProjections', true);" ..
+                  "openspace.setPropertyValue('Scene.Charon.renderable.ProjectionComponent.ClearAllProjections', true);",
         Documentation = "Removes all image projections from Pluto and Charon.",
         Local = false
     },
     {
         Key = "F9",
         Command = "openspace.time.setTime('2015-07-14T09:00:00.00');" ..
-                  "openspace.setPropertyValue('Pluto.renderable.ClearAllProjections', true);" ..
-                  "openspace.setPropertyValue('Charon.renderable.ClearAllProjections', true);",
+                  "openspace.setPropertyValue('Scene.Pluto.renderable.ClearAllProjections', true);" ..
+                  "openspace.setPropertyValue('Scene.Charon.renderable.ClearAllProjections', true);",
         Documentation = "Jumps to the 14th of July 2015 at 0900 UTC and clears all projections.",
         Local = false
     },
     {
         Key = "KP_8",
-        Command = sceneHelper.property.increment('Pluto.renderable.HeightExaggeration', 5000000),
+        Command = propertyHelper.increment('Scene.Pluto.renderable.HeightExaggeration', 5000000),
         Documentation = "Increases the height map exaggeration on Pluto.",
         Local = false
     },
     {
         Key = "KP_2",
-        Command = sceneHelper.property.decrement('Pluto.renderable.HeightExaggeration', 5000000),
+        Command = propertyHelper.decrement('Scene.Pluto.renderable.HeightExaggeration', 5000000),
         Documentation = "Decreases the height map exaggeration on Pluto.",
         Local = false
     },
     {
         Key = "KP_9",
-        Command = sceneHelper.property.increment('Charon.renderable.HeightExaggeration', 5000000),
+        Command = propertyHelper.increment('Scene.Charon.renderable.HeightExaggeration', 5000000),
         Documentation = "Increases the height map exaggeration on Charon.",
         Local = false
     },
     {
         Key = "KP_3",
-        Command = sceneHelper.property.decrement('Charon.renderable.HeightExaggeration', 5000000),
+        Command = propertyHelper.decrement('Scene.Charon.renderable.HeightExaggeration', 5000000),
         Documentation = "Decreases the height map exaggeration on Charon.",
         Local = false
     },
     {
         Key = "q",
-        Command = sceneHelper.property.invert('SunMarker.renderable.Enabled'),
+        Command = propertyHelper.invert('Scene.SunMarker.renderable.Enabled'),
         Documentation = "Toggles the visibility of the text marking the location of the Sun.",
         Local = false
     },
     {
         Key = "e",
-        Command = sceneHelper.property.invert('EarthMarker.renderable.Enabled'),
+        Command = propertyHelper.invert('Scene.EarthMarker.renderable.Enabled'),
         Documentation = "Toggles the visibility of the text marking the location of the Earth.",
         Local = false
     },
     {
         Key = "o",
-        Command = sceneHelper.property.invert('PlutoTrail.renderable.Enabled'),
+        Command = propertyHelper.invert('Scene.PlutoTrail.renderable.Enabled'),
         Documentation = "Toggles the visibility of the trail behind Pluto.",
         Local = false
     },
     {
         Key = "j",
-        Command = sceneHelper.renderable.toggle('PlutoText') .. sceneHelper.renderable.toggle('CharonText') ..
-                  sceneHelper.renderable.toggle('HydraText') .. sceneHelper.renderable.toggle('NixText') ..
-                  sceneHelper.renderable.toggle('KerberosText') .. sceneHelper.renderable.toggle('StyxText'),
+        Command = renderableHelper.toggle('Scene.PlutoText') .. renderableHelper.toggle('Scene.CharonText') ..
+                  renderableHelper.toggle('Scene.HydraText') .. renderableHelper.toggle('Scene.NixText') ..
+                  renderableHelper.toggle('Scene.KerberosText') .. renderableHelper.toggle('Scene.StyxText'),
         Documentation = "Toggles the visibility of the text labels of Pluto, Charon, Hydra, Nix, Kerberos, and Styx.",
         Local = false
     },
     {
         Key = "l",
-        Command = sceneHelper.property.invert('Labels.renderable.Enabled'),
+        Command = propertyHelper.invert('Scene.Labels.renderable.Enabled'),
         Documentation = "Toggles the visibility of the labels for the New Horizons instruments.",
         Local = false
     },
     {
         Key = "m",
-        Command = sceneHelper.property.invert('NH_LORRI.renderable.SolidDraw') ..
-                  sceneHelper.property.invert('NH_RALPH_LEISA.renderable.SolidDraw') ..
-                  sceneHelper.property.invert('NH_RALPH_MVIC_PAN1.renderable.SolidDraw') ..
-                  sceneHelper.property.invert('NH_RALPH_MVIC_PAN2.renderable.SolidDraw') ..
-                  sceneHelper.property.invert('NH_RALPH_MVIC_RED.renderable.SolidDraw') ..
-                  sceneHelper.property.invert('NH_RALPH_MVIC_BLUE.renderable.SolidDraw') ..
-                  sceneHelper.property.invert('NH_RALPH_MVIC_FT.renderable.SolidDraw') ..
-                  sceneHelper.property.invert('NH_RALPH_MVIC_METHANE.renderable.SolidDraw') ..
-                  sceneHelper.property.invert('NH_RALPH_MVIC_NIR.renderable.SolidDraw') ..
-                  sceneHelper.property.invert('NH_ALICE_AIRGLOW.renderable.SolidDraw') ..
-                  sceneHelper.property.invert('NH_ALICE_SOC.renderable.SolidDraw'),
+        Command = propertyHelper.invert('Scene.NH_LORRI.renderable.SolidDraw') ..
+                  propertyHelper.invert('Scene.NH_RALPH_LEISA.renderable.SolidDraw') ..
+                  propertyHelper.invert('Scene.NH_RALPH_MVIC_PAN1.renderable.SolidDraw') ..
+                  propertyHelper.invert('Scene.NH_RALPH_MVIC_PAN2.renderable.SolidDraw') ..
+                  propertyHelper.invert('Scene.NH_RALPH_MVIC_RED.renderable.SolidDraw') ..
+                  propertyHelper.invert('Scene.NH_RALPH_MVIC_BLUE.renderable.SolidDraw') ..
+                  propertyHelper.invert('Scene.NH_RALPH_MVIC_FT.renderable.SolidDraw') ..
+                  propertyHelper.invert('Scene.NH_RALPH_MVIC_METHANE.renderable.SolidDraw') ..
+                  propertyHelper.invert('Scene.NH_RALPH_MVIC_NIR.renderable.SolidDraw') ..
+                  propertyHelper.invert('Scene.NH_ALICE_AIRGLOW.renderable.SolidDraw') ..
+                  propertyHelper.invert('Scene.NH_ALICE_SOC.renderable.SolidDraw'),
         Documentation = "Draws the instrument field of views in a solid color or as lines.",
         Local = false
     },
     {
         Key = "t",
-        Command = sceneHelper.renderable.toggle('PlutoShadow') .. sceneHelper.renderable.toggle('CharonShadow'),
+        Command = renderableHelper.toggle('Scene.PlutoShadow') .. renderableHelper.toggle('Scene.CharonShadow'),
         Documentation = "Toggles the visibility of the shadow visualization of Pluto and Charon.",
         Local = false
     }
diff --git a/data/assets/osirisrex.scene b/data/assets/osirisrex.scene
index 556981a006..98a30d82b0 100644
--- a/data/assets/osirisrex.scene
+++ b/data/assets/osirisrex.scene
@@ -1,5 +1,6 @@
 local assetHelper = asset.require('util/asset_helper')
 local sceneHelper = asset.require('util/scene_helper')
+local propertyHelper = asset.require('util/property_helper')
 
 -- Specifying which other assets should be loaded in this scene
 asset.require('spice/base')
@@ -64,13 +65,13 @@ local Keybindings = {
     },
     {
         Key = "q",
-        Command = sceneHelper.property.invert('SunMarker.renderable.Enabled'),
+        Command = propertyHelper.invert('Scene.SunMarker.renderable.Enabled'),
         Documentation = "Toggles the visibility of the text marking the location of the Sun.",
         Local = false
     },
     {
         Key = "e",
-        Command = sceneHelper.property.invert('EarthMarker.renderable.Enabled'),
+        Command = propertyHelper.invert('Scene.EarthMarker.renderable.Enabled'),
         Documentation = "Toggles the visibility of the text marking the location of the Earth.",
         Local = false
     }
diff --git a/data/assets/rosetta.scene b/data/assets/rosetta.scene
index 93f37fa291..b4fe3750e1 100644
--- a/data/assets/rosetta.scene
+++ b/data/assets/rosetta.scene
@@ -1,5 +1,7 @@
 local assetHelper = asset.require('util/asset_helper')
 local sceneHelper = asset.require('util/scene_helper')
+local propertyHelper = asset.require('util/property_helper')
+local renderableHelper = asset.require('util/renderable_helper')
 
 -- Specifying which other assets should be loaded in this scene
 asset.require('spice/base')
@@ -41,38 +43,38 @@ local Keybindings = {
     },
     {
         Key = "F8",
-        Command = "openspace.setPropertyValue('67P.renderable.ProjectionComponent.clearAllProjections', true)",
+        Command = "openspace.setPropertyValue('Scene.67P.renderable.ProjectionComponent.clearAllProjections', true)",
         Documentation = "Removes all image projections from 67P.",
         Local = false
     },
     {
         Key = "q",
-        Command = sceneHelper.property.invert('SunMarker.renderable.Enabled'),
+        Command = propertyHelper.invert('Scene.SunMarker.renderable.Enabled'),
         Documentation = "Toggles the visibility of the text marking the location of the Sun.",
         Local = false
     },
     {
         Key = "e",
-        Command = helper.renderable.toggle('JupiterTrail') .. helper.renderable.toggle('SaturnTrail') ..
-                  helper.renderable.toggle('UranusTrail') .. helper.renderable.toggle('NeptuneTrail'),
+        Command = renderableHelper.toggle('Scene.JupiterTrail') .. renderableHelper.toggle('Scene.SaturnTrail') ..
+                  renderableHelper.toggle('Scene.UranusTrail') .. renderableHelper.toggle('Scene.NeptuneTrail'),
         Documentation = "Toggles the visibility of all trails further from the Sun than 67P.",
         Local = false
     },
     {
         Key = "i",
-        Command = sceneHelper.renderable.toggle('ImagePlaneRosetta'),
+        Command = renderableHelper.toggle('Scene.ImagePlaneRosetta'),
         Documentation = "Toggles the visibility of the free floating image plane.",
         Local = false
     },
     {
         Key = "f",
-        Command = sceneHelper.renderable.toggle('PhilaeTrail'),
+        Command = renderableHelper.toggle('Scene.PhilaeTrail'),
         Documentation = "Toggles the visibility of Philae's trail.",
         Local = false
     },
     {
         Key = "p",
-        Command = sceneHelper.property.invert('67P.renderable.ProjectionComponent.performProjection'),
+        Command = propertyHelper.invert('Scene.67P.renderable.ProjectionComponent.performProjection'),
         Documentation = "Enables or disables the image projection on 67P.",
         Local = false
     }
@@ -129,7 +131,7 @@ asset.onInitialize(function ()
         Rotation = { -0.106166, 0.981574, -0.084545, 0.134513 },
     })
 
-    openspace.setPropertyValue('67P.renderable.PerformShading', false);
+    openspace.setPropertyValue('Scene.67P.renderable.PerformShading', false);
 end)
 
 asset.onDeinitialize(function ()
diff --git a/data/assets/scene/solarsystem/missions/osirisrex/osirisrex.asset b/data/assets/scene/solarsystem/missions/osirisrex/osirisrex.asset
index 6d5bff9427..1444106adc 100644
--- a/data/assets/scene/solarsystem/missions/osirisrex/osirisrex.asset
+++ b/data/assets/scene/solarsystem/missions/osirisrex/osirisrex.asset
@@ -2,19 +2,15 @@ asset.request('./bennu')
 asset.request('./model')
 asset.request('./trail')
 
-
+asset.require('./script_schedule')
 
 local mission = asset.localResource('osirisrex.mission')
 local missionName
 
-local scriptSchedule = asset.localResource("scheduled_scripts.lua")
-
 asset.onInitialize(function()
     missionName = openspace.loadMission(mission)
-    openspace.scriptScheduler.loadFile(scriptSchedule)
 end)
 
 asset.onDeinitialize(function()
     openspace.unloadMission(missionName)
-    -- openspace.scriptScheduler.unloadFile
 end)
diff --git a/data/assets/scene/solarsystem/missions/osirisrex/scheduled_scripts.lua b/data/assets/scene/solarsystem/missions/osirisrex/scheduled_scripts.lua
deleted file mode 100644
index 39698b5532..0000000000
--- a/data/assets/scene/solarsystem/missions/osirisrex/scheduled_scripts.lua
+++ /dev/null
@@ -1,14 +0,0 @@
-dofile(openspace.absPath("${SCRIPTS}/common.lua"))
-
-return {
-    helper.scheduledScript.setEnabled("2016 SEP 08 23:05:00", "OsirisRexTrailSolarSystem", false),
-    helper.scheduledScript.setEnabled("2016 SEP 08 23:05:00", "OsirisRexTrailBennu", false),
-
-    helper.scheduledScript.reversible.setEnabled("2016 SEP 08 23:05:01", "OsirisRexTrailEarth", true),
-    helper.scheduledScript.reversible.setEnabled("2016 SEP 09 00:00:00", "OsirisRexTrailSolarSystem", true),
-    helper.scheduledScript.reversible.setEnabled("2016 SEP 09 02:00:00", "OsirisRexTrailEarth", false),
-    helper.scheduledScript.reversible.setEnabled("2018 OCT 11 00:00:00", "OsirisRexTrailBennu", true),
-    helper.scheduledScript.reversible.setEnabled("2018 OCT 15 00:00:00", "OsirisRexTrailSolarSystem", false),
-    helper.scheduledScript.reversible.setEnabled("2019 AUG 01 00:00:00", "OsirisRexTrailSolarSystem", true),
-    helper.scheduledScript.reversible.setEnabled("2019 AUG 01 00:00:00", "OsirisRexTrailBennu", false),
-}
diff --git a/data/assets/scene/solarsystem/missions/osirisrex/script_schedule.asset b/data/assets/scene/solarsystem/missions/osirisrex/script_schedule.asset
new file mode 100644
index 0000000000..147d918cfe
--- /dev/null
+++ b/data/assets/scene/solarsystem/missions/osirisrex/script_schedule.asset
@@ -0,0 +1,18 @@
+local scriptSchedulerHelper = asset.require('util/script_scheduler_helper')
+
+asset.onInitialize(function ()
+    scriptSchedulerHelper.scheduleRenderableEnabled("2016 SEP 08 23:05:00", "OsirisRexTrailSolarSystem", false)
+    scriptSchedulerHelper.scheduleRenderableEnabled("2016 SEP 08 23:05:00", "OsirisRexTrailBennu", false)
+    scriptSchedulerHelper.scheduleRenderableEnabledReversable("2016 SEP 08 23:05:01", "OsirisRexTrailEarth", true)
+    scriptSchedulerHelper.scheduleRenderableEnabledReversable("2016 SEP 09 00:00:00", "OsirisRexTrailSolarSystem", true)
+    scriptSchedulerHelper.scheduleRenderableEnabledReversable("2016 SEP 09 02:00:00", "OsirisRexTrailEarth", false)
+    scriptSchedulerHelper.scheduleRenderableEnabledReversable("2018 OCT 11 00:00:00", "OsirisRexTrailBennu", true)
+    scriptSchedulerHelper.scheduleRenderableEnabledReversable("2018 OCT 15 00:00:00", "OsirisRexTrailSolarSystem", false)
+    scriptSchedulerHelper.scheduleRenderableEnabledReversable("2019 AUG 01 00:00:00", "OsirisRexTrailSolarSystem", true)
+    scriptSchedulerHelper.scheduleRenderableEnabledReversable("2019 AUG 01 00:00:00", "OsirisRexTrailBennu", false)
+end)
+
+
+asset.onDeinitialize(function ()
+	openspace.scriptScheduler.clear()
+end)
\ No newline at end of file
diff --git a/data/assets/util/default_keybindings.asset b/data/assets/util/default_keybindings.asset
index 01fcea5ee6..5a8e0b800b 100644
--- a/data/assets/util/default_keybindings.asset
+++ b/data/assets/util/default_keybindings.asset
@@ -1,23 +1,24 @@
-local helper = asset.require('./scene_helper')
+local sceneHelper = asset.require('./scene_helper')
+local propertyHelper = asset.require('./property_helper')
 
 local Keybindings = {
     {
         Key = "F2",
         Command =
-[[local b = openspace.getPropertyValue('Global Properties.ImGUI.Main.Properties.Enabled');
-local c = openspace.getPropertyValue('Global Properties.ImGUI.Main.IsHidden');
-openspace.setPropertyValue('Global Properties.ImGUI.*.Enabled', false);
+[[local b = openspace.getPropertyValue('Modules.ImGUI.Main.Scene Properties.Enabled');
+local c = openspace.getPropertyValue('Modules.ImGUI.Main.IsHidden');
+openspace.setPropertyValue('Modules.ImGUI.*.Enabled', false);
 if b and c then
     -- This can happen if the main properties window is enabled, the main gui is enabled
     -- and then closed again. So the main properties window is enabled, but also all
     -- windows are hidden
-    openspace.setPropertyValueSingle('Global Properties.ImGUI.Main.IsHidden', false);
-    openspace.setPropertyValueSingle('Global Properties.ImGUI.Main.Properties.Enabled', true);
-    openspace.setPropertyValueSingle('Global Properties.ImGUI.Main.Space/Time.Enabled', true);
+    openspace.setPropertyValueSingle('Modules.ImGUI.Main.IsHidden', false);
+    openspace.setPropertyValueSingle('Modules.ImGUI.Main.Scene Properties.Enabled', true);
+    openspace.setPropertyValueSingle('Modules.ImGUI.Main.Space/Time.Enabled', true);
 else
-    openspace.setPropertyValueSingle('Global Properties.ImGUI.Main.Properties.Enabled', not b);
-    openspace.setPropertyValueSingle('Global Properties.ImGUI.Main.Space/Time.Enabled', not b);
-    openspace.setPropertyValueSingle('Global Properties.ImGUI.Main.IsHidden', b);
+    openspace.setPropertyValueSingle('Modules.ImGUI.Main.Scene Properties.Enabled', not b);
+    openspace.setPropertyValueSingle('Modules.ImGUI.Main.Space/Time.Enabled', not b);
+    openspace.setPropertyValueSingle('Modules.ImGUI.Main.IsHidden', b);
 end]],
         Documentation = "Shows or hides the properties window",
         Local = true
@@ -25,15 +26,15 @@ end]],
     {
         Key = "F3",
         Command = 
-[[local b = openspace.getPropertyValue('Global Properties.ImGUI.Main.Enabled');
-openspace.setPropertyValueSingle('Global Properties.ImGUI.Main.Enabled', not b);
-openspace.setPropertyValueSingle('Global Properties.ImGUI.Main.IsHidden', b);]],
+[[local b = openspace.getPropertyValue('Modules.ImGUI.Main.Enabled');
+openspace.setPropertyValueSingle('Modules.ImGUI.Main.Enabled', not b);
+openspace.setPropertyValueSingle('Modules.ImGUI.Main.IsHidden', b);]],
         Documentation = "Shows or hides the entire user interface",
         Local = true
     },
     {
         Key = "F4",
-        Command = helper.property.invert("RenderEngine.PerformanceMeasurements"),
+        Command = propertyHelper.invert("RenderEngine.PerformanceMeasurements"),
         Documentation = "Toogles performance measurements that shows rendering time informations.",
         Local = true
     },
@@ -57,19 +58,19 @@ openspace.setPropertyValueSingle('Global Properties.ImGUI.Main.IsHidden', b);]],
     },
     {
         Key = "f",
-        Command = helper.property.invert('NavigationHandler.OrbitalNavigator.Friction.RotationalFriction'),
+        Command = propertyHelper.invert('NavigationHandler.OrbitalNavigator.Friction.RotationalFriction'),
         Documentation = "Toggles the rotational friction of the camera. If it is disabled, the camera rotates around the focus object indefinitely.",
         Local = false
     },
     {
         Key = "Shift+f",
-        Command = helper.property.invert('NavigationHandler.OrbitalNavigator.Friction.ZoomFriction'),
+        Command = propertyHelper.invert('NavigationHandler.OrbitalNavigator.Friction.ZoomFriction'),
         Documentation = "Toggles the zoom friction of the camera. If it is disabled, the camera rises up from or closes in towards the focus object indefinitely.",
         Local = false
     },
     {
         Key = "Ctrl+f",
-        Command = helper.property.invert('NavigationHandler.OrbitalNavigator.Friction.RollFriction'),
+        Command = propertyHelper.invert('NavigationHandler.OrbitalNavigator.Friction.RollFriction'),
         Documentation = "Toggles the roll friction of the camera. If it is disabled, the camera rolls around its own axis indefinitely.",
         Local = false
     },
@@ -84,9 +85,9 @@ openspace.setPropertyValueSingle('Global Properties.ImGUI.Main.IsHidden', b);]],
 local DeltaTimeKeys
 
 asset.onInitialize(function()
-    Keys = helper.bindKeys(Keybindings)
+    Keys = sceneHelper.bindKeys(Keybindings)
 
-    DeltaTimeKeys = helper.setDeltaTimeKeys({
+    DeltaTimeKeys = sceneHelper.setDeltaTimeKeys({
     --  1           2           3           4           5           6           7           8           9           0
     --------------------------------------------------------------------------------------------------------------------------
     --  1s          2s          5s          10s         30s         1m          2m          5m          10m         30m
@@ -102,8 +103,8 @@ asset.onInitialize(function()
 end)
 
 asset.onDeinitialize(function ()
-    helper.unbindKeys(Keybindings)
-    helper.unbindKeys(DeltaTimeKeys)
+    sceneHelper.unbindKeys(Keybindings)
+    sceneHelper.unbindKeys(DeltaTimeKeys)
 end)
 
 asset.export("DefaultKeybindings", Keybindings)
diff --git a/data/assets/util/property_helper.asset b/data/assets/util/property_helper.asset
new file mode 100644
index 0000000000..8d3576d130
--- /dev/null
+++ b/data/assets/util/property_helper.asset
@@ -0,0 +1,21 @@
+-- Function that returns the string that inverts the fully qualified boolean property 'property'
+local invert = function(prop)
+    local escaped_property = "'" .. prop .. "'"
+    return "openspace.setPropertyValue(" .. escaped_property .. ", not openspace.getPropertyValue(" .. escaped_property .. "));"
+end
+
+-- Function that returns the string that increments the 'property' by the 'value'
+local increment = function(prop, value)
+    local v = value or 1
+    local escaped_property = "'" .. prop .. "'"
+    return "openspace.setPropertyValue(" .. escaped_property .. ", openspace.getPropertyValue(" .. escaped_property .. ") + " .. v .. ");"
+end
+
+-- Function that returns the string that decrements the 'property' by the 'value'
+local decrement = function(prop, value)
+    return increment(prop, -value)
+end
+
+asset.export('invert', invert)
+asset.export('increment', increment)
+asset.export('decrement', decrement)
diff --git a/data/assets/util/renderable_helper.asset b/data/assets/util/renderable_helper.asset
new file mode 100644
index 0000000000..300e66a574
--- /dev/null
+++ b/data/assets/util/renderable_helper.asset
@@ -0,0 +1,15 @@
+local propertyHelper = asset.require('./property_helper')
+
+-- Function that returns the string that enables/disables the renderable 'renderable'
+local toggle = function(renderable)
+    return propertyHelper.invert(renderable .. ".renderable.Enabled")
+end
+
+-- Function that returns the string that sets the enabled property of <renderable> to <enabled>
+local setEnabled = function(renderable, enabled)
+    return "openspace.setPropertyValue('" .. renderable .. ".renderable.Enabled', " .. (enabled and "true" or "false") .. ");";
+end
+
+
+asset.export('toggle', toggle)
+asset.export('setEnabled', setEnabled)
\ No newline at end of file
diff --git a/data/assets/util/scene_helper.asset b/data/assets/util/scene_helper.asset
index fa84befc03..45139ec6c6 100644
--- a/data/assets/util/scene_helper.asset
+++ b/data/assets/util/scene_helper.asset
@@ -52,11 +52,3 @@ local setDeltaTimeKeys = function(t)
     return result
 end
 asset.export("setDeltaTimeKeys", setDeltaTimeKeys)
-
------------------------------------------------------------------
-
-dofile(openspace.absPath("${SCRIPTS}/common.lua"))
-
-asset.export("property", helper.property)
-asset.export("renderable", helper.renderable)
-asset.export("scheduledScript", helper.scheduledScript)
diff --git a/data/assets/util/script_scheduler_helper.asset b/data/assets/util/script_scheduler_helper.asset
new file mode 100644
index 0000000000..4a3727b9b3
--- /dev/null
+++ b/data/assets/util/script_scheduler_helper.asset
@@ -0,0 +1,24 @@
+local renderableHelper = asset.require('./renderable_helper')
+
+-- Function that schedules scripts setting the enabled property 
+-- of <renderable> to <enabled> at time <time>.
+local scheduleRenderableEnabled = function(time, renderable, enabled)
+    openspace.scriptScheduler.loadScheduledScript(
+        time,
+        renderableHelper.setEnabled(renderable, enabled)
+    )
+end
+
+-- Function that schedules scripts setting the enabled property 
+-- of <renderable> to <enabled> when time <time> is passed
+-- and inverts it if time is passed in reversed order.
+local scheduleRenderableEnabledReversable = function(time, renderable, enabled)
+    openspace.scriptScheduler.loadScheduledScript(
+        time,
+        renderableHelper.setEnabled(renderable, enabled),
+        renderableHelper.setEnabled(renderable, not enabled)
+    )
+end
+
+asset.export('scheduleRenderableEnabledReversable', scheduleRenderableEnabledReversable)
+asset.export('scheduleRenderableEnabled', scheduleRenderableEnabled)
diff --git a/data/web/common/base.js b/data/web/common/base.js
new file mode 100644
index 0000000000..b362bc94fc
--- /dev/null
+++ b/data/web/common/base.js
@@ -0,0 +1,4 @@
+function parseJson(elementId) {
+  var jsonElement = document.getElementById(elementId);
+  return JSON.parse(jsonElement.innerHTML);
+}
diff --git a/data/web/common/style.css b/data/web/common/style.css
index f785e54ff7..b22e07cb61 100644
--- a/data/web/common/style.css
+++ b/data/web/common/style.css
@@ -8,25 +8,40 @@
 
 .documentation-item {
   background-color: #f4f4f4;
-  border-left: 2px solid #888;
+  border-left: 6px solid;
   padding-left: 10px;
   padding-top: 5px;
   padding-right: 5px;
   margin-bottom: 5px;
 }
 
-.documentation-item .documentation-item {
-  border-left: 2px solid #f00;
-  background-color: #fff;
-}
-
-.documentation-item .documentation-item .documentation-item {
-  border-left: 2px solid #080;
+.item-level-1 {
+  border-color: #343C47;
   background-color: #f4f4f4;
 }
 
-.documentation-item .documentation-item .documentation-item .documentation-item {
-  border-left: 2px solid #00f;
+.item-level-2 {
+  border-color: #505760;
+  background-color: #fff;
+}
+
+.item-level-3 {
+  border-color: #5E6C7C;
+  background-color: #f4f4f4;
+}
+
+.item-level-4 {
+  border-color: #537399;
+  background-color: #fff;
+}
+
+.item-level-5 {
+  border-color: #2569BA;
+  background-color: #f4f4f4;
+}
+
+.item-level-6 {
+  border-color: #208AE2;
   background-color: #fff;
 }
 
@@ -69,16 +84,15 @@
   font-size: 0.8em;
 }
 
-
 /*!
  * Start Bootstrap - Simple Sidebar (http://startbootstrap.com/)
  * Copyright 2013-2016 Start Bootstrap
  * Licensed under MIT (https://github.com/BlackrockDigital/startbootstrap/blob/gh-pages/LICENSE)
  */
 
- body {
-    overflow-x: hidden;
- }
+body {
+  overflow-x: hidden;
+}
 
 /* Toggle Styles */
 
diff --git a/data/web/documentation/documentation.hbs b/data/web/documentation/documentation.hbs
index 2b7bbbd84d..b22165447b 100644
--- a/data/web/documentation/documentation.hbs
+++ b/data/web/documentation/documentation.hbs
@@ -1,5 +1,5 @@
 {{#each entries}}
-  <div class="documentation-item">
+  <div class="documentation-item item-level-{{level name}}">
     <div class="row">
       <div class="col-lg-12">
         <p>
diff --git a/data/web/documentation/script.js b/data/web/documentation/script.js
index f9af37e558..00bd699b00 100644
--- a/data/web/documentation/script.js
+++ b/data/web/documentation/script.js
@@ -18,6 +18,19 @@ window.onload = function () {
     return identifier;
   });
 
+  Handlebars.registerHelper('level', function(options, context) {
+    var data = context.data;
+    var level = 0;
+
+    while (data = data._parent) {
+      if (data.key !== undefined) {
+        ++level;
+      }
+    }
+
+    return level;
+  });
+
   documentation.sort(function (a, b) {
     return a.name < b.name ? -1 : (a.name > b.name ? 1 : 0);
   });
diff --git a/data/web/factories/factory.hbs b/data/web/factories/factory.hbs
index ea23b014fc..7c73a9462f 100644
--- a/data/web/factories/factory.hbs
+++ b/data/web/factories/factory.hbs
@@ -1,5 +1,5 @@
 {{#each classes}}
-  <div class="documentation-item">
+  <div class="documentation-item item-level-{{level name}}">
     <div class="row">
       <div class="col-lg-12">
         <p>
diff --git a/data/web/factories/script.js b/data/web/factories/script.js
index 4776d5656e..02322b7f3e 100644
--- a/data/web/factories/script.js
+++ b/data/web/factories/script.js
@@ -18,6 +18,19 @@ window.onload = function () {
     return identifier;
   });
 
+  Handlebars.registerHelper('level', function(options, context) {
+    var data = context.data;
+    var level = 0;
+
+    while (data = data._parent) {
+      if (data.key !== undefined) {
+        ++level;
+      }
+    }
+
+    return level;
+  });
+
   factories.sort(function (a, b) {
     return a.name < b.name ? -1 : (a.name > b.name ? 1 : 0);
   });
diff --git a/data/web/kameleondocumentation/script.js b/data/web/kameleondocumentation/script.js
index 84f9665e59..5fb0baf75f 100644
--- a/data/web/kameleondocumentation/script.js
+++ b/data/web/kameleondocumentation/script.js
@@ -15,6 +15,19 @@ window.onload = function () {
     return identifier;
   });
 
+  Handlebars.registerHelper('level', function(options, context) {
+    var data = context.data;
+    var level = 0;
+
+    while (data = data._parent) {
+      if (data.key !== undefined) {
+        ++level;
+      }
+    }
+
+    return level;
+  });
+
   var dataElement = document.getElementById('data');
   var data = JSON.parse(dataElement.innerHTML);
 
diff --git a/data/web/keybindings/keybinding.hbs b/data/web/keybindings/keybinding.hbs
index 4873cdef05..cca289cb31 100644
--- a/data/web/keybindings/keybinding.hbs
+++ b/data/web/keybindings/keybinding.hbs
@@ -1,11 +1,11 @@
-<div class="documentation-item {{#if remoteScripting}}remote-scripting{{else}}local-scripting{{/if}}">
+<div class="documentation-item item-level-{{level name}} {{#if remoteScripting}}remote-scripting{{else}}local-scripting{{/if}}">
   <div class="row">
     <div class="col-lg-12">
       <p>
         <a href="#{{urlify key}}" name="{{urlify key}}">
           <span class="documentation-key">{{key}}</span> <span class="documentation-type">{{#if remoteScripting}}Remote scripting{{else}}Local scripting{{/if}}</span>
         </a>
-        <p>{{script}}</p>
+        <p><code>{{script}}</code></p>
         <p>{{documentation}}</p>
       </p>
     </div>
diff --git a/data/web/keybindings/script.js b/data/web/keybindings/script.js
index 16e3aa580b..018d49eb48 100644
--- a/data/web/keybindings/script.js
+++ b/data/web/keybindings/script.js
@@ -18,6 +18,19 @@ window.onload = function () {
     return identifier;
   });
 
+  Handlebars.registerHelper('level', function(options, context) {
+    var data = context.data;
+    var level = 0;
+
+    while (data = data._parent) {
+      if (data.key !== undefined) {
+        ++level;
+      }
+    }
+
+    return level;
+  });
+
   keybindings.sort(function (a, b) {
     return a.key < b.key ? -1 : (a.key > b.key ? 1 : 0);
   });
diff --git a/data/web/luascripting/script.js b/data/web/luascripting/script.js
index 6d43a33b07..da7dede2e4 100644
--- a/data/web/luascripting/script.js
+++ b/data/web/luascripting/script.js
@@ -18,6 +18,19 @@ window.onload = function () {
     return identifier;
   });
 
+  Handlebars.registerHelper('level', function(options, context) {
+    var data = context.data;
+    var level = 0;
+
+    while (data = data._parent) {
+      if (data.key !== undefined) {
+        ++level;
+      }
+    }
+
+    return level;
+  });
+
   scripting.sort(function (a, b) {
     return a.library < b.library ? -1 : (a.library > b.library ? 1 : 0);
   });
diff --git a/data/web/luascripting/scripting.hbs b/data/web/luascripting/scripting.hbs
index 00313e3372..00e35ab6d4 100644
--- a/data/web/luascripting/scripting.hbs
+++ b/data/web/luascripting/scripting.hbs
@@ -1,5 +1,5 @@
 {{#each functions}}
-  <div class="documentation-item">
+  <div class="documentation-item item-level-{{level name}}">
     <div class="row">
       <div class="col-lg-12">
         <p>
diff --git a/data/web/properties/main.hbs b/data/web/properties/main.hbs
index f62398d2bb..ae6024b98f 100644
--- a/data/web/properties/main.hbs
+++ b/data/web/properties/main.hbs
@@ -3,7 +3,7 @@
     <ul class="sidebar-nav">
       <li class="sidebar-brand">
         <a href="#">
-            OpenSpace Scene Properties
+            OpenSpace Properties
         </a>
       </li>
       {{#each propertyOwners}}
@@ -28,8 +28,6 @@
             {{/each}}
             {{#each propertyOwners}}
               {{> propertyOwner}}
-            {{else}}
-              <p>{{name}} has no property owners</p>
             {{/each}}
           </div>
         </div>
diff --git a/data/web/properties/property.hbs b/data/web/properties/property.hbs
index 7a0bd7a430..51dd8ec75c 100644
--- a/data/web/properties/property.hbs
+++ b/data/web/properties/property.hbs
@@ -1,4 +1,4 @@
-<div class="documentation-item">
+<div class="documentation-item item-level-{{level name}}">
   <div class="row">
     <div class="col-lg-12" title="{{guiName}}">
       <p>
@@ -7,7 +7,8 @@
           <span class="documentation-key">{{id}}</span>
         </a>
       </p>
-      <p class="documentation-description">{{fullyQualifiedId}}
+      <p class="documentation-description">
+        <code>{{fullyQualifiedId}}</code>
         <a class="documentation-small" onclick="copyTextToClipboard('{{fullyQualifiedId}}')">copy</a>
       </p>
       <p class="documentation-documentation">{{description}}</p>
diff --git a/data/web/properties/propertyowner.hbs b/data/web/properties/propertyowner.hbs
index 9d0885e0a1..2417eceaf3 100644
--- a/data/web/properties/propertyowner.hbs
+++ b/data/web/properties/propertyowner.hbs
@@ -1,4 +1,4 @@
-<div class="documentation-item">
+<div class="documentation-item item-level-{{level name}}">
   <div class="row">
     <div class="col-lg-12">
       <p>
diff --git a/data/web/properties/script.js b/data/web/properties/script.js
index d63ced4110..642d860c05 100644
--- a/data/web/properties/script.js
+++ b/data/web/properties/script.js
@@ -46,6 +46,19 @@ window.onload = function () {
     return identifier;
   });
 
+  Handlebars.registerHelper('level', function(options, context) {
+    var data = context.data;
+    var level = 0;
+
+    while (data = data._parent) {
+      if (data.key !== undefined) {
+        ++level;
+      }
+    }
+
+    return level;
+  });
+
   propertyOwners.sort(function (a, b) {
     return a.name < b.name ? -1 : (a.name > b.name ? 1 : 0);
   });
diff --git a/data/web/scenelicense/script.js b/data/web/scenelicense/script.js
index e0594d2829..9e1e815d80 100644
--- a/data/web/scenelicense/script.js
+++ b/data/web/scenelicense/script.js
@@ -18,6 +18,19 @@ window.onload = function () {
     return identifier;
   });
 
+  Handlebars.registerHelper('level', function(options, context) {
+    var data = context.data;
+    var level = 0;
+
+    while (data = data._parent) {
+      if (data.key !== undefined) {
+        ++level;
+      }
+    }
+
+    return level;
+  });
+
   var data = {
     sceneLicenses: sceneLicenses,
     version: version
diff --git a/include/openspace/engine/configurationmanager.h b/include/openspace/engine/configurationmanager.h
index b73e823475..2fd47c0e67 100644
--- a/include/openspace/engine/configurationmanager.h
+++ b/include/openspace/engine/configurationmanager.h
@@ -62,7 +62,9 @@ public:
     static const std::string KeyLuaDocumentation;
     /// The key that stores the scripting log
     static const std::string KeyScriptLog;
-    /// The key that stores the Property documentation
+    /// The key that stores the Scene Property documentation
+    static const std::string KeyScenePropertyDocumentation;
+    /// The key that stores the Root Property documentation
     static const std::string KeyPropertyDocumentation;
     /// The key that stores the keyboard bindings that should be stored
     static const std::string KeyKeyboardShortcuts;
diff --git a/include/openspace/engine/moduleengine.h b/include/openspace/engine/moduleengine.h
index 7acd98dbe2..547f6e5c2c 100644
--- a/include/openspace/engine/moduleengine.h
+++ b/include/openspace/engine/moduleengine.h
@@ -28,6 +28,7 @@
 #include <memory>
 #include <vector>
 
+#include <openspace/properties/propertyowner.h>
 #include <openspace/util/openspacemodule.h>
 
 #include <ghoul/misc/assert.h>
@@ -47,8 +48,10 @@ namespace scripting { struct LuaLibrary; }
  * Additional OpenSpaceModule%s can be registered with the #registerModule function, which
  * will internally call the OpenSpaceModule::initialize method.
  */
-class ModuleEngine {
+class ModuleEngine : public properties::PropertyOwner {
 public:
+    ModuleEngine();
+
     /**
      * Registers all of the OpenSpaceModule%s which are created by the CMake configuration
      * and stored in the <code>moduleregistration.h</code> file. For all of those modules
diff --git a/include/openspace/engine/openspaceengine.h b/include/openspace/engine/openspaceengine.h
index 33d40baead..29d46fcadf 100644
--- a/include/openspace/engine/openspaceengine.h
+++ b/include/openspace/engine/openspaceengine.h
@@ -55,7 +55,6 @@ class ParallelConnection;
 class RenderEngine;
 class Scene;
 class SyncEngine;
-class SettingsEngine;
 class TimeManager;
 class VirtualPropertyManager;
 class WindowWrapper;
@@ -131,12 +130,12 @@ public:
     NetworkEngine& networkEngine();
     ParallelConnection& parallelConnection();
     RenderEngine& renderEngine();
-    SettingsEngine& settingsEngine();
     TimeManager& timeManager();
     WindowWrapper& windowWrapper();
     ghoul::fontrendering::FontManager& fontManager();
     interaction::NavigationHandler& navigationHandler();
     interaction::KeyBindingManager& keyBindingManager();
+    properties::PropertyOwner& rootPropertyOwner();
     properties::PropertyOwner& globalPropertyOwner();
     scripting::ScriptEngine& scriptEngine();
     scripting::ScriptScheduler& scriptScheduler();
@@ -215,7 +214,6 @@ private:
     std::unique_ptr<NetworkEngine> _networkEngine;
     std::unique_ptr<ParallelConnection> _parallelConnection;
     std::unique_ptr<RenderEngine> _renderEngine;
-    std::unique_ptr<SettingsEngine> _settingsEngine;
     std::unique_ptr<SyncEngine> _syncEngine;
     std::unique_ptr<TimeManager> _timeManager;
     std::unique_ptr<WindowWrapper> _windowWrapper;
@@ -229,7 +227,8 @@ private:
     std::unique_ptr<VirtualPropertyManager> _virtualPropertyManager;
 
     // Others
-    std::unique_ptr<properties::PropertyOwner> _globalPropertyNamespace;
+    std::unique_ptr<properties::PropertyOwner> _rootPropertyOwner;
+    std::unique_ptr<properties::PropertyOwner> _globalPropertyOwner;
 
     std::unique_ptr<LoadingScreen> _loadingScreen;
 
diff --git a/include/openspace/engine/settingsengine.h b/include/openspace/engine/settingsengine.h
deleted file mode 100644
index d292a57947..0000000000
--- a/include/openspace/engine/settingsengine.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2018                                                               *
- *                                                                                       *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
- * software and associated documentation files (the "Software"), to deal in the Software *
- * without restriction, including without limitation the rights to use, copy, modify,    *
- * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
- * permit persons to whom the Software is furnished to do so, subject to the following   *
- * conditions:                                                                           *
- *                                                                                       *
- * The above copyright notice and this permission notice shall be included in all copies *
- * or substantial portions of the Software.                                              *
- *                                                                                       *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
- * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
- * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
- ****************************************************************************************/
-
-#ifndef __OPENSPACE_CORE___SETTINGSENGINE___H__
-#define __OPENSPACE_CORE___SETTINGSENGINE___H__
-
-#include <openspace/properties/propertyowner.h>
-
-#include <openspace/properties/optionproperty.h>
-#include <openspace/properties/scalar/boolproperty.h>
-#include <openspace/properties/scalar/floatproperty.h>
-
-#include <vector>
-
-namespace openspace {
-
-class OpenSpaceModule;
-
-class SettingsEngine : public properties::PropertyOwner {
-public:
-    SettingsEngine();
-
-    void initialize();
-
-    void setModules(const std::vector<OpenSpaceModule*>& modules);
-
-private:
-    properties::OptionProperty _scenes;
-};
-
-} // namespace openspace
-
-#endif // __OPENSPACE_CORE___SETTINGSENGINE___H__
diff --git a/include/openspace/properties/propertyowner.h b/include/openspace/properties/propertyowner.h
index a2c2430886..4bcfac0b75 100644
--- a/include/openspace/properties/propertyowner.h
+++ b/include/openspace/properties/propertyowner.h
@@ -25,6 +25,8 @@
 #ifndef __OPENSPACE_CORE___PROPERTYOWNER___H__
 #define __OPENSPACE_CORE___PROPERTYOWNER___H__
 
+#include <openspace/documentation/documentationgenerator.h>
+
 #include <map>
 #include <string>
 #include <vector>
@@ -47,7 +49,7 @@ class Property;
  * URI contains separators (<code>.</code>), the first name before the separator will be
  * used as a subOwner's name and the search will proceed recursively.
  */
-class PropertyOwner {
+class PropertyOwner : public DocumentationGenerator {
 public:
     /// The separator that is used while accessing the properties and/or sub-owners
     static const char URISeparator = '.';
@@ -238,6 +240,8 @@ public:
     void removeTag(const std::string& tag);
 
 private:
+    std::string generateJson() const override;
+
     /// The name of this PropertyOwner
     std::string _name;
     /// The description for this PropertyOwner
diff --git a/include/openspace/scene/scene.h b/include/openspace/scene/scene.h
index da9dc23f44..1d703bb68e 100644
--- a/include/openspace/scene/scene.h
+++ b/include/openspace/scene/scene.h
@@ -25,8 +25,6 @@
 #ifndef __OPENSPACE_CORE___SCENE___H__
 #define __OPENSPACE_CORE___SCENE___H__
 
-#include <openspace/documentation/documentationgenerator.h>
-
 #include <vector>
 #include <unordered_map>
 #include <set>
@@ -40,6 +38,8 @@
 #include <openspace/util/camera.h>
 #include <openspace/util/updatestructures.h>
 
+#include <openspace/properties/propertyowner.h>
+
 #include <ghoul/opengl/programobject.h>
 
 namespace ghoul { class Dictionary; }
@@ -50,9 +50,10 @@ namespace documentation { struct Documentation; }
 
 // Notifications:
 // SceneGraphFinishedLoading
-class Scene : public DocumentationGenerator {
+class Scene
+    : public properties::PropertyOwner
+{
 public:
-
     using UpdateDependencies = ghoul::Boolean;
 
     struct InvalidSceneError : ghoul::RuntimeError {
@@ -182,8 +183,6 @@ public:
     static scripting::LuaLibrary luaLibrary();
 
 private:
-    std::string generateJson() const override;
-
     /**
      * Update dependencies.
      */
diff --git a/modules/imgui/imguimodule.cpp b/modules/imgui/imguimodule.cpp
index 2bebd14f48..0a17c7da73 100644
--- a/modules/imgui/imguimodule.cpp
+++ b/modules/imgui/imguimodule.cpp
@@ -27,9 +27,9 @@
 #include <modules/imgui/include/gui.h>
 
 #include <openspace/engine/openspaceengine.h>
-#include <openspace/engine/settingsengine.h>
 #include <openspace/engine/virtualpropertymanager.h>
 #include <openspace/engine/wrapper/windowwrapper.h>
+#include <openspace/engine/moduleengine.h>
 #include <openspace/interaction/navigationhandler.h>
 #include <openspace/interaction/luaconsole.h>
 #include <openspace/network/parallelconnection.h>
@@ -67,7 +67,6 @@ ImGUIModule::ImGUIModule() : OpenSpaceModule(Name) {
                 []() {
                     std::vector<properties::PropertyOwner*> res = {
                         &(OsEng.windowWrapper()),
-                        &(OsEng.settingsEngine()),
                         &(OsEng.navigationHandler()),
                         &(OsEng.renderEngine()),
                         &(OsEng.parallelConnection()),
@@ -86,7 +85,15 @@ ImGUIModule::ImGUIModule() : OpenSpaceModule(Name) {
                 }
             );
 
-            gui._property.setSource(
+            gui._moduleProperty.setSource(
+                []() {
+                    std::vector<properties::PropertyOwner*> v;
+                    v.push_back(&(OsEng.moduleEngine()));
+                    return v;
+                }
+            );
+
+            gui._sceneProperty.setSource(
                 []() {
                     const Scene* scene = OsEng.renderEngine().scene();
                     const std::vector<SceneGraphNode*>& nodes = scene ?
@@ -197,7 +204,7 @@ ImGUIModule::ImGUIModule() : OpenSpaceModule(Name) {
         [&](Key key, KeyModifier mod, KeyAction action) -> bool {
             // A list of all the windows that can show up by themselves
             if (gui.isEnabled() || gui._performance.isEnabled() ||
-                gui._property.isEnabled())
+                gui._sceneProperty.isEnabled())
             {
                 return gui.keyCallback(key, mod, action);
             }
@@ -211,7 +218,7 @@ ImGUIModule::ImGUIModule() : OpenSpaceModule(Name) {
         [&](unsigned int codepoint, KeyModifier modifier) -> bool {
             // A list of all the windows that can show up by themselves
             if (gui.isEnabled() || gui._performance.isEnabled() ||
-                gui._property.isEnabled())
+                gui._sceneProperty.isEnabled())
             {
                 return gui.charCallback(codepoint, modifier);
             }
@@ -225,7 +232,7 @@ ImGUIModule::ImGUIModule() : OpenSpaceModule(Name) {
         [&](MouseButton button, MouseAction action) -> bool {
             // A list of all the windows that can show up by themselves
             if (gui.isEnabled() || gui._performance.isEnabled() ||
-                gui._property.isEnabled())
+                gui._sceneProperty.isEnabled())
             {
                 return gui.mouseButtonCallback(button, action);
             }
@@ -239,7 +246,7 @@ ImGUIModule::ImGUIModule() : OpenSpaceModule(Name) {
         [&](double, double posY) -> bool {
             // A list of all the windows that can show up by themselves
             if (gui.isEnabled() || gui._performance.isEnabled() ||
-                gui._property.isEnabled())
+                gui._sceneProperty.isEnabled())
             {
                 return gui.mouseWheelCallback(posY);
             }
diff --git a/modules/imgui/include/gui.h b/modules/imgui/include/gui.h
index 57a87eb682..f4646ec0ef 100644
--- a/modules/imgui/include/gui.h
+++ b/modules/imgui/include/gui.h
@@ -75,9 +75,12 @@ public:
     GuiGlobeBrowsingComponent _globeBrowsing;
 #endif //  GLOBEBROWSING_USE_GDAL
     GuiPerformanceComponent _performance;
+
     GuiPropertyComponent _globalProperty;
-    GuiPropertyComponent _property;
+    GuiPropertyComponent _sceneProperty;
     GuiPropertyComponent _screenSpaceProperty;
+    GuiPropertyComponent _moduleProperty;
+
     GuiPropertyComponent _virtualProperty;
     GuiSpaceTimeComponent _spaceTime;
     GuiMissionComponent _mission;
diff --git a/modules/imgui/src/gui.cpp b/modules/imgui/src/gui.cpp
index 68802dc108..092693a1f7 100644
--- a/modules/imgui/src/gui.cpp
+++ b/modules/imgui/src/gui.cpp
@@ -280,9 +280,10 @@ void CaptionText(const char* text) {
 
 GUI::GUI()
     : GuiComponent("Main")
-    , _globalProperty("Global")
-    , _property(
-        "Properties",
+    , _globalProperty("Global Properties")
+    , _moduleProperty("Module Properties")
+    , _sceneProperty(
+        "Scene Properties",
         GuiPropertyComponent::UseTreeLayout::Yes
     )
     , _screenSpaceProperty("ScreenSpace Properties")
@@ -297,7 +298,8 @@ GUI::GUI()
     addPropertySubOwner(_help);
     addPropertySubOwner(_performance);
     addPropertySubOwner(_globalProperty);
-    addPropertySubOwner(_property);
+    addPropertySubOwner(_moduleProperty);
+    addPropertySubOwner(_sceneProperty);
     addPropertySubOwner(_screenSpaceProperty);
     _featuredProperties.setEnabled(true);
     addPropertySubOwner(_featuredProperties);
@@ -323,7 +325,8 @@ GUI::GUI()
 #endif // GLOBEBROWSING_USE_GDAL
             _performance.setShowHelpTooltip(_showHelpText);
             _globalProperty.setShowHelpTooltip(_showHelpText);
-            _property.setShowHelpTooltip(_showHelpText);
+            _moduleProperty.setShowHelpTooltip(_showHelpText);
+            _sceneProperty.setShowHelpTooltip(_showHelpText);
             _screenSpaceProperty.setShowHelpTooltip(_showHelpText);
             _virtualProperty.setShowHelpTooltip(_showHelpText);
             _spaceTime.setShowHelpTooltip(_showHelpText);
@@ -348,7 +351,8 @@ GUI::GUI()
 #endif // GLOBEBROWSING_USE_GDAL
             _performance.setShowHelpTooltipDelay(_helpTextDelay);
             _globalProperty.setShowHelpTooltipDelay(_helpTextDelay);
-            _property.setShowHelpTooltipDelay(_helpTextDelay);
+            _moduleProperty.setShowHelpTooltipDelay(_helpTextDelay);
+            _sceneProperty.setShowHelpTooltipDelay(_helpTextDelay);
             _screenSpaceProperty.setShowHelpTooltipDelay(_helpTextDelay);
             _virtualProperty.setShowHelpTooltipDelay(_helpTextDelay);
             _spaceTime.setShowHelpTooltipDelay(_helpTextDelay);
@@ -479,12 +483,14 @@ void GUI::initialize() {
         style.Colors[ImGuiCol_TextSelectedBg] = ImVec4(0.44f, 0.63f, 1.00f, 0.35f);
         style.Colors[ImGuiCol_ModalWindowDarkening] = ImVec4(0.20f, 0.20f, 0.20f, 0.35f);
     }
-    _property.initialize();
-    _property.setHasRegularProperties(true);
+    _sceneProperty.initialize();
+    _sceneProperty.setHasRegularProperties(true);
     _screenSpaceProperty.initialize();
     _screenSpaceProperty.setHasRegularProperties(true);
     _globalProperty.initialize();
     _globalProperty.setHasRegularProperties(true);
+    _moduleProperty.initialize();
+    _moduleProperty.setHasRegularProperties(true);
     _featuredProperties.initialize();
     _featuredProperties.setHasRegularProperties(true);
     _virtualProperty.initialize();
@@ -518,6 +524,7 @@ void GUI::deinitialize() {
     _help.deinitialize();
     _performance.deinitialize();
     _globalProperty.deinitialize();
+    _moduleProperty.deinitialize();
     _featuredProperties.deinitialize();
     _screenSpaceProperty.deinitialize();
     _virtualProperty.deinitialize();
@@ -526,7 +533,7 @@ void GUI::deinitialize() {
 #ifdef GLOBEBROWSING_USE_GDAL
     _globeBrowsing.deinitialize();
 #endif // GLOBEBROWSING_USE_GDAL
-    _property.deinitialize();
+    _sceneProperty.deinitialize();
 
     delete iniFileBuffer;
 }
@@ -614,9 +621,10 @@ void GUI::initializeGL() {
     glBindVertexArray(0);
     glBindBuffer(GL_ARRAY_BUFFER, 0);
 
-    _property.initializeGL();
+    _sceneProperty.initializeGL();
     _screenSpaceProperty.initializeGL();
     _globalProperty.initializeGL();
+    _moduleProperty.initializeGL();
     _featuredProperties.initializeGL();
     _performance.initializeGL();
     _help.initializeGL();
@@ -656,13 +664,14 @@ void GUI::deinitializeGL() {
     _performance.deinitializeGL();
     _featuredProperties.deinitializeGL();
     _globalProperty.deinitializeGL();
+    _moduleProperty.deinitializeGL();
     _screenSpaceProperty.deinitializeGL();
 #ifdef GLOBEBROWSING_USE_GDAL
     _globeBrowsing.deinitializeGL();
 #endif // GLOBEBROWSING_USE_GDAL
     _filePath.deinitializeGL();
     _asset.deinitializeGL();
-    _property.deinitializeGL();
+    _sceneProperty.deinitializeGL();
 }
 
 void GUI::startFrame(float deltaTime, const glm::vec2& windowSize,
@@ -709,8 +718,11 @@ void GUI::endFrame() {
         if (_globalProperty.isEnabled()) {
             _globalProperty.render();
         }
-        if (_property.isEnabled()) {
-            _property.render();
+        if (_moduleProperty.isEnabled()) {
+            _moduleProperty.render();
+        }
+        if (_sceneProperty.isEnabled()) {
+            _sceneProperty.render();
         }
         if (_screenSpaceProperty.isEnabled()) {
             _screenSpaceProperty.render();
@@ -832,9 +844,9 @@ void GUI::render() {
 
     _isCollapsed = ImGui::IsWindowCollapsed();
 
-    bool property = _property.isEnabled();
-    ImGui::Checkbox("Scene Graph Properties", &property);
-    _property.setEnabled(property);
+    bool sceneProperty = _sceneProperty.isEnabled();
+    ImGui::Checkbox("Scene Graph Properties", &sceneProperty);
+    _sceneProperty.setEnabled(sceneProperty);
 
     bool screenSpaceProperty = _screenSpaceProperty.isEnabled();
     ImGui::Checkbox("ScreenSpace Properties", &screenSpaceProperty);
@@ -848,6 +860,10 @@ void GUI::render() {
     ImGui::Checkbox("Global Properties", &globalProperty);
     _globalProperty.setEnabled(globalProperty);
 
+    bool moduleProperty = _moduleProperty.isEnabled();
+    ImGui::Checkbox("Module Properties", &moduleProperty);
+    _moduleProperty.setEnabled(moduleProperty);
+
     bool spacetime = _spaceTime.isEnabled();
     ImGui::Checkbox("Space/Time", &spacetime);
     _spaceTime.setEnabled(spacetime);
@@ -961,7 +977,8 @@ void GUI::renderAndUpdatePropertyVisibility() {
 
     _currentVisibility = static_cast<V>(t);
     _globalProperty.setVisibility(_currentVisibility);
-    _property.setVisibility(_currentVisibility);
+    _moduleProperty.setVisibility(_currentVisibility);
+    _sceneProperty.setVisibility(_currentVisibility);
     _screenSpaceProperty.setVisibility(_currentVisibility);
     _virtualProperty.setVisibility(_currentVisibility);
     _featuredProperties.setVisibility(_currentVisibility);
diff --git a/openspace.cfg b/openspace.cfg
index 03d39ffdc5..f71fa86c58 100644
--- a/openspace.cfg
+++ b/openspace.cfg
@@ -87,6 +87,7 @@ return {
 
     LuaDocumentation = "${DOCUMENTATION}/LuaScripting.html",
     PropertyDocumentation = "${DOCUMENTATION}/Properties.html",
+    ScenePropertyDocumentation = "${DOCUMENTATION}/SceneProperties.html",
     KeyboardShortcuts = "${DOCUMENTATION}/KeyboardMapping.html",
     Documentation = "${DOCUMENTATION}/Documentation.html",
     FactoryDocumentation = "${DOCUMENTATION}/FactoryDocumentation.html",
diff --git a/scripts/common.lua b/scripts/common.lua
deleted file mode 100644
index 963cf1efef..0000000000
--- a/scripts/common.lua
+++ /dev/null
@@ -1,54 +0,0 @@
-helper = {}
-helper.property = {}
-
--- Function that returns the string that inverts the fully qualified boolean property 'property'
-helper.property.invert = function(prop)
-    local escaped_property = "'" .. prop .. "'"
-    return "openspace.setPropertyValue(" .. escaped_property .. ", not openspace.getPropertyValue(" .. escaped_property .. "));"
-end
-
--- Function that returns the string that increments the 'property' by the 'value'
-helper.property.increment = function(prop, value)
-    local v = value or 1
-    local escaped_property = "'" .. prop .. "'"
-    return "openspace.setPropertyValue(" .. escaped_property .. ", openspace.getPropertyValue(" .. escaped_property .. ") + " .. v .. ");"
-end
-
--- Function that returns the string that decrements the 'property' by the 'value'
-helper.property.decrement = function(prop, value)
-    return helper.property.increment(prop, -value)
-end
-
-
-
-helper.renderable = {}
-
--- Function that returns the string that enables/disables the renderable 'renderable'
-helper.renderable.toggle = function(renderable)
-    return helper.property.invert(renderable .. ".renderable.Enabled")
-end
-
--- Function that returns the string that sets the enabled property of <renderable> to <enabled>
-helper.renderable.setEnabled = function(renderable, enabled)
-    return "openspace.setPropertyValue('" .. renderable .. ".renderable.Enabled', " .. (enabled and "true" or "false") .. ");";
-end
-
-helper.scheduledScript = {}
-helper.scheduledScript.reversible = {}
-
--- Function that returns a lua table specifying a reversible ScheduledScript for 
--- setting the enabled property of <renderable> to <enabled> at time <time>.
-helper.scheduledScript.reversible.setEnabled = function(time, renderable, enabled)
-    return {
-        Time = time,
-        ForwardScript = helper.renderable.setEnabled(renderable, enabled),
-        BackwardScript = helper.renderable.setEnabled(renderable, not enabled)
-    }
-end
-
-helper.scheduledScript.setEnabled = function(time, renderable, enabled)
-    return {
-        Time = time,
-        ForwardScript = helper.renderable.setEnabled(renderable, enabled)
-    }
-end
\ No newline at end of file
diff --git a/scripts/core_scripts.lua b/scripts/core_scripts.lua
index 6467fbfefd..8c9ee568ae 100644
--- a/scripts/core_scripts.lua
+++ b/scripts/core_scripts.lua
@@ -76,7 +76,7 @@ end
 
 openspace.setDefaultGuiSorting = function()
     openspace.setPropertyValueSingle(
-        'Global Properties.ImGUI.Main.Properties.Ordering',
+        'Modules.ImGUI.Main.Scene Properties.Ordering',
         {
             "Solar System", "Milky Way", "Universe", "Other"
         }
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 58dde2a0ea..db11c83533 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -38,7 +38,6 @@ set(OPENSPACE_SOURCE
     ${OPENSPACE_BASE_DIR}/src/engine/moduleengine.cpp
     ${OPENSPACE_BASE_DIR}/src/engine/moduleengine_lua.inl
     ${OPENSPACE_BASE_DIR}/src/engine/openspaceengine.cpp
-    ${OPENSPACE_BASE_DIR}/src/engine/settingsengine.cpp
     ${OPENSPACE_BASE_DIR}/src/engine/syncengine.cpp
     ${OPENSPACE_BASE_DIR}/src/engine/virtualpropertymanager.cpp
     ${OPENSPACE_BASE_DIR}/src/engine/wrapper/sgctwindowwrapper.cpp
@@ -203,7 +202,6 @@ set(OPENSPACE_HEADER
     ${OPENSPACE_BASE_DIR}/include/openspace/engine/logfactory.h
     ${OPENSPACE_BASE_DIR}/include/openspace/engine/moduleengine.h
     ${OPENSPACE_BASE_DIR}/include/openspace/engine/openspaceengine.h
-    ${OPENSPACE_BASE_DIR}/include/openspace/engine/settingsengine.h
     ${OPENSPACE_BASE_DIR}/include/openspace/engine/syncengine.h
     ${OPENSPACE_BASE_DIR}/include/openspace/engine/virtualpropertymanager.h
     ${OPENSPACE_BASE_DIR}/include/openspace/engine/wrapper/sgctwindowwrapper.h
diff --git a/src/documentation/documentationengine.cpp b/src/documentation/documentationengine.cpp
index a8688dd3dc..d6304dace4 100644
--- a/src/documentation/documentationengine.cpp
+++ b/src/documentation/documentationengine.cpp
@@ -282,18 +282,7 @@ std::string DocumentationEngine::generateJson() const {
 
     json << "]";
 
-    std::string jsonString = "";
-    for (const char& c : json.str()) {
-        switch (c) {
-            case '\'':
-                jsonString += "\\'";
-                break;
-            default:
-                jsonString += c;
-        }
-    }
-
-    return jsonString;
+    return json.str();
 }
 
 void DocumentationEngine::addDocumentation(Documentation doc) {
diff --git a/src/documentation/documentationgenerator.cpp b/src/documentation/documentationgenerator.cpp
index 28a7dac2f1..f756068c80 100644
--- a/src/documentation/documentationgenerator.cpp
+++ b/src/documentation/documentationgenerator.cpp
@@ -36,6 +36,7 @@
 
 namespace {
     const char* HandlebarsFilename = "${WEB}/common/handlebars-v4.0.5.js";
+    const char* BaseLibraryFilename = "${WEB}/common/base.js";
     const char* BootstrapFilename = "${WEB}/common/bootstrap.min.css";
     const char* CssFilename = "${WEB}/common/style.css";
 } // namespace
@@ -70,6 +71,14 @@ void DocumentationGenerator::writeDocumentation(const std::string& filename) {
         std::istreambuf_iterator<char>()
     );
 
+    std::ifstream baseLibarayInput;
+    baseLibarayInput.exceptions(~std::ofstream::goodbit);
+    baseLibarayInput.open(absPath(BaseLibraryFilename));
+    const std::string baseLibraryContent = std::string(
+        std::istreambuf_iterator<char>(baseLibarayInput),
+        std::istreambuf_iterator<char>()
+    );
+
     std::ifstream jsInput;
     jsInput.exceptions(~std::ofstream::goodbit);
     jsInput.open(absPath(_javascriptFile));
@@ -120,6 +129,8 @@ void DocumentationGenerator::writeDocumentation(const std::string& filename) {
                    << "</script>"                                                 << '\n';
     }
 
+    const std::string DataId = "data";
+
     const std::string Version =
         "[" +
         std::to_string(OPENSPACE_VERSION_MAJOR) + "," +
@@ -127,11 +138,19 @@ void DocumentationGenerator::writeDocumentation(const std::string& filename) {
         std::to_string(OPENSPACE_VERSION_PATCH) +
         "]";
 
+    file
+        << "\t" << "<script id=\"" << DataId
+        << "\" type=\"text/application/json\">" << '\n'
+        << json << '\n'
+        << "\t" << "</script>" << '\n';
+
+
     file
          << "\t"   << "<script>"                                                  << '\n'
-         << "\t\t" << "var " << _jsonName << " = JSON.parse('" << json << "');"   << '\n'
+         << "\t\t" << "var " << _jsonName << " = parseJson('" << DataId << "');"  << '\n'
          << "\t\t" << "var version = " << Version << ";"                          << '\n'
          << "\t\t" << handlebarsContent                                           << '\n'
+         << "\t\t" << baseLibraryContent                                          << '\n'
          << "\t\t" << jsContent                                                   << '\n'
          << "\t"   << "</script>"                                                 << '\n'
          << "\t"   << "<style type=\"text/css\">"                                 << '\n'
@@ -150,21 +169,19 @@ std::string escapedJson(const std::string& text) {
     for (const char& c : text) {
         switch (c) {
         case '\t':
-            jsonString += "\\t";
+            jsonString += "\\t"; // Replace tab with \t.
             break;
         case '"':
-            // The " character has to be double escaped as JSON.parse will remove a single
-            // escape character, thus leaving only " behind that breaks the string
-            jsonString += "\\\\\"";
+            jsonString += "\\\""; // Replace " with \".
             break;
         case '\\':
-            jsonString += "\\\\";
+            jsonString += "\\\\"; // Replace \ with \\.
             break;
         case '\n':
-            jsonString += "\\\\n";
+            jsonString += "\\\\n"; // Replace newline with \n.
             break;
         case '\r':
-            jsonString += "\\r";
+            jsonString += "\\r"; // Replace carriage return with \r.
             break;
         default:
             jsonString += c;
diff --git a/src/engine/configurationmanager.cpp b/src/engine/configurationmanager.cpp
index cb4fee908d..85f0ad04eb 100644
--- a/src/engine/configurationmanager.cpp
+++ b/src/engine/configurationmanager.cpp
@@ -58,6 +58,7 @@ const string ConfigurationManager::PartFile = "File";
 const string ConfigurationManager::KeyLuaDocumentation = "LuaDocumentation";
 const string ConfigurationManager::KeyScriptLog = "ScriptLog";
 const string ConfigurationManager::KeyPropertyDocumentation = "PropertyDocumentation";
+const string ConfigurationManager::KeyScenePropertyDocumentation = "ScenePropertyDocumentation";
 const string ConfigurationManager::KeyKeyboardShortcuts = "KeyboardShortcuts";
 const string ConfigurationManager::KeyDocumentation = "Documentation";
 const string ConfigurationManager::KeyFactoryDocumentation = "FactoryDocumentation";
diff --git a/src/engine/moduleengine.cpp b/src/engine/moduleengine.cpp
index d806a69f0e..bc69689c65 100644
--- a/src/engine/moduleengine.cpp
+++ b/src/engine/moduleengine.cpp
@@ -42,6 +42,10 @@ namespace {
 
 namespace openspace {
 
+ModuleEngine::ModuleEngine()
+    : properties::PropertyOwner({"Modules"})
+{}
+
 void ModuleEngine::initialize(const ghoul::Dictionary& moduleConfigurations) {
     for (OpenSpaceModule* m : AllModules()) {
         const std::string name = m->name();
@@ -84,6 +88,7 @@ void ModuleEngine::registerModule(std::unique_ptr<OpenSpaceModule> m,
 
     LDEBUG("Registering module '" << m->name() << "'");
     m->initialize(this, configuration);
+    addPropertySubOwner(m.get());
     LDEBUG("Registered module '" << m->name() << "'");
     _modules.push_back(std::move(m));
 }
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index 6fd7fa6c33..8c198ef516 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -32,7 +32,6 @@
 #include <openspace/engine/downloadmanager.h>
 #include <openspace/engine/logfactory.h>
 #include <openspace/engine/moduleengine.h>
-#include <openspace/engine/settingsengine.h>
 #include <openspace/engine/syncengine.h>
 #include <openspace/engine/virtualpropertymanager.h>
 #include <openspace/engine/wrapper/windowwrapper.h>
@@ -157,7 +156,6 @@ OpenSpaceEngine::OpenSpaceEngine(std::string programName,
     , _networkEngine(new NetworkEngine)
     , _parallelConnection(new ParallelConnection)
     , _renderEngine(new RenderEngine)
-    , _settingsEngine(new SettingsEngine)
     , _syncEngine(std::make_unique<SyncEngine>(4096))
     , _timeManager(new TimeManager)
     , _windowWrapper(std::move(windowWrapper))
@@ -169,7 +167,7 @@ OpenSpaceEngine::OpenSpaceEngine(std::string programName,
     , _scriptEngine(new scripting::ScriptEngine)
     , _scriptScheduler(new scripting::ScriptScheduler)
     , _virtualPropertyManager(new VirtualPropertyManager)
-    , _globalPropertyNamespace(new properties::PropertyOwner({ "" }))
+    , _rootPropertyOwner(new properties::PropertyOwner({ "" }))
     , _loadingScreen(nullptr)
     , _versionInformation{
         properties::StringProperty(VersionInfo, OPENSPACE_VERSION_STRING_FULL),
@@ -180,24 +178,24 @@ OpenSpaceEngine::OpenSpaceEngine(std::string programName,
     , _shutdown({false, 0.f, 0.f})
     , _isFirstRenderingFirstFrame(true)
 {
-    _navigationHandler->setPropertyOwner(_globalPropertyNamespace.get());
+    _rootPropertyOwner->addPropertySubOwner(_moduleEngine.get());
 
+    _navigationHandler->setPropertyOwner(_rootPropertyOwner.get());
     // New property subowners also have to be added to the ImGuiModule callback!
-    _globalPropertyNamespace->addPropertySubOwner(_navigationHandler.get());
-    _globalPropertyNamespace->addPropertySubOwner(_settingsEngine.get());
-    _globalPropertyNamespace->addPropertySubOwner(_renderEngine.get());
-    if (_windowWrapper) {
-        _globalPropertyNamespace->addPropertySubOwner(_windowWrapper.get());
-    }
-    _globalPropertyNamespace->addPropertySubOwner(_parallelConnection.get());
-    _globalPropertyNamespace->addPropertySubOwner(_console.get());
-    _globalPropertyNamespace->addPropertySubOwner(_dashboard.get());
+    _rootPropertyOwner->addPropertySubOwner(_navigationHandler.get());
 
+    _rootPropertyOwner->addPropertySubOwner(_renderEngine.get());
+    if (_windowWrapper) {
+        _rootPropertyOwner->addPropertySubOwner(_windowWrapper.get());
+    }
+    _rootPropertyOwner->addPropertySubOwner(_parallelConnection.get());
+    _rootPropertyOwner->addPropertySubOwner(_console.get());
+    _rootPropertyOwner->addPropertySubOwner(_dashboard.get());
 
     _versionInformation.versionString.setReadOnly(true);
-    _globalPropertyNamespace->addProperty(_versionInformation.versionString);
+    _rootPropertyOwner->addProperty(_versionInformation.versionString);
     _versionInformation.sourceControlInformation.setReadOnly(true);
-    _globalPropertyNamespace->addProperty(_versionInformation.sourceControlInformation);
+    _rootPropertyOwner->addProperty(_versionInformation.sourceControlInformation);
 
     FactoryManager::initialize();
     FactoryManager::ref().addFactory(
@@ -566,10 +564,6 @@ void OpenSpaceEngine::initialize() {
         );
     }
 
-    // Initialize the SettingsEngine
-    _settingsEngine->initialize();
-    _settingsEngine->setModules(_moduleEngine->modules());
-
     // Initialize the NavigationHandler
     _navigationHandler->initialize();
 
@@ -651,6 +645,7 @@ void OpenSpaceEngine::loadSingleAsset(const std::string& assetPath) {
         _renderEngine->setCamera(nullptr);
         _navigationHandler->setCamera(nullptr);
         _scene->clear();
+        _rootPropertyOwner->removePropertySubOwner(_scene.get());
     }
 
     bool multiThreadedInitialization = configurationManager().hasKeyAndValue<bool>(
@@ -669,6 +664,7 @@ void OpenSpaceEngine::loadSingleAsset(const std::string& assetPath) {
     }
 
     _scene = std::make_unique<Scene>(std::move(sceneInitializer));
+    _rootPropertyOwner->addPropertySubOwner(_scene.get());
     _scene->setCamera(std::make_unique<Camera>());
     Camera* camera = _scene->camera();
     camera->setParent(_scene->root());
@@ -993,8 +989,16 @@ void OpenSpaceEngine::writeSceneDocumentation() {
     }
 
     // If a PropertyDocumentationFile was specified, generate it now.
-    if (configurationManager().hasKey(ConfigurationManager::KeyPropertyDocumentation)) {
+    if (configurationManager().hasKey(ConfigurationManager::KeyScenePropertyDocumentation)) {
         _scene->writeDocumentation(
+            absPath(configurationManager().value<std::string>(
+                ConfigurationManager::KeyScenePropertyDocumentation
+                ))
+        );
+    }
+
+    if (configurationManager().hasKey(ConfigurationManager::KeyPropertyDocumentation)) {
+        _rootPropertyOwner->writeDocumentation(
             absPath(configurationManager().value<std::string>(
                 ConfigurationManager::KeyPropertyDocumentation
                 ))
@@ -1687,11 +1691,6 @@ RenderEngine& OpenSpaceEngine::renderEngine() {
     return *_renderEngine;
 }
 
-SettingsEngine& OpenSpaceEngine::settingsEngine() {
-    ghoul_assert(_settingsEngine, "Settings Engine must not be nullptr");
-    return *_settingsEngine;
-}
-
 TimeManager& OpenSpaceEngine::timeManager() {
     ghoul_assert(_timeManager, "Download Manager must not be nullptr");
     return *_timeManager;
@@ -1727,12 +1726,12 @@ interaction::KeyBindingManager& OpenSpaceEngine::keyBindingManager() {
     return *_keyBindingManager;
 }
 
-properties::PropertyOwner& OpenSpaceEngine::globalPropertyOwner() {
+properties::PropertyOwner& OpenSpaceEngine::rootPropertyOwner() {
     ghoul_assert(
-        _globalPropertyNamespace,
-        "Global Property Namespace must not be nullptr"
-    );
-    return *_globalPropertyNamespace;
+                 _rootPropertyOwner,
+                 "Root Property Namespace must not be nullptr"
+                 );
+    return *_rootPropertyOwner;
 }
 
 VirtualPropertyManager& OpenSpaceEngine::virtualPropertyManager() {
diff --git a/src/engine/settingsengine.cpp b/src/engine/settingsengine.cpp
deleted file mode 100644
index b2597c0ada..0000000000
--- a/src/engine/settingsengine.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2018                                                               *
- *                                                                                       *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
- * software and associated documentation files (the "Software"), to deal in the Software *
- * without restriction, including without limitation the rights to use, copy, modify,    *
- * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
- * permit persons to whom the Software is furnished to do so, subject to the following   *
- * conditions:                                                                           *
- *                                                                                       *
- * The above copyright notice and this permission notice shall be included in all copies *
- * or substantial portions of the Software.                                              *
- *                                                                                       *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
- * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
- * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
- ****************************************************************************************/
-
-#include <openspace/engine/settingsengine.h>
-
-#include <openspace/engine/openspaceengine.h>
-#include <openspace/engine/configurationmanager.h>
-#include <openspace/engine/wrapper/windowwrapper.h>
-#include <openspace/util/openspacemodule.h>
-#include <openspace/util/spicemanager.h>
-#include <openspace/scene/scene.h>
-
-
-#include <ghoul/ghoul.h>
-#include <ghoul/filesystem/filesystem.h>
-#include <ghoul/logging/logmanager.h>
-
-#include <string>
-
-namespace {
-    static const openspace::properties::Property::PropertyInfo SceneInfo = {
-        "Scenes",
-        "Current Scene",
-        "Specifies the currently loaded scene. If this value is changed it will cause "
-        "the current scene to be unloaded and the newly selected scene to be loaded"
-    };
-
-} // namespace
-
-namespace openspace {
-
-SettingsEngine::SettingsEngine()
-    : properties::PropertyOwner({ "Global Properties" })
-    , _scenes(SceneInfo, properties::OptionProperty::DisplayType::Dropdown)
-{
-    addProperty(_scenes);
-}
-
-void SettingsEngine::initialize() {
-    // Load all matching files in the Scene
-    // TODO: match regex with either with new ghoul readFiles or local code
-    const std::string sceneDir = "${ASSETS}";
-    const std::vector<std::string> scenes =
-        ghoul::filesystem::Directory(sceneDir).readFiles();
-    const size_t nScenes = scenes.size();
-
-    for (std::size_t i = 0; i < nScenes; ++i) {
-        const std::size_t found = scenes[i].find_last_of("/\\");
-        _scenes.addOption(static_cast<int>(i), scenes[i].substr(found + 1));
-    }
-    _scenes.addOption(static_cast<int>(scenes.size()), "None");
-
-    // Set interaction to change ConfigurationManager and schedule the load
-    _scenes.onChange([this, nScenes, sceneDir]() {
-        if (_scenes == static_cast<int>(nScenes)) {
-            OsEng.scheduleLoadSingleAsset("");
-        } else {
-            std::string sceneFile = _scenes.getDescriptionByValue(_scenes);
-            OsEng.configurationManager().setValue(
-                ConfigurationManager::KeyConfigAsset, sceneFile);
-            OsEng.scheduleLoadSingleAsset(sceneDir + "/" + sceneFile);
-        }
-    }
-    );
-}
-
-void SettingsEngine::setModules(const std::vector<OpenSpaceModule*>& modules) {
-    for (OpenSpaceModule* m : modules) {
-        addPropertySubOwner(m);
-    }
-}
-
-}  // namespace openspace
diff --git a/src/interaction/keybindingmanager.cpp b/src/interaction/keybindingmanager.cpp
index 9c2827334f..b0b0cecb0a 100644
--- a/src/interaction/keybindingmanager.cpp
+++ b/src/interaction/keybindingmanager.cpp
@@ -159,7 +159,7 @@ std::string KeyBindingManager::generateJson() const {
         first = false;
         json << "{";
         json << "\"key\": \"" << std::to_string(p.first) << "\",";
-        json << "\"script\": \"" << p.second.command << "\",";
+        json << "\"script\": \"" << escapedJson(p.second.command) << "\",";
         json << "\"remoteScripting\": "
              << (p.second.synchronization ? "true," : "false,");
         json << "\"documentation\": \"" << escapedJson(p.second.documentation) << "\"";
@@ -167,16 +167,7 @@ std::string KeyBindingManager::generateJson() const {
     }
     json << "]";
 
-    std::string jsonString = "";
-    for (const char& c : json.str()) {
-        if (c == '\'') {
-            jsonString += "\\'";
-        } else {
-            jsonString += c;
-        }
-    }
-
-    return jsonString;
+    return json.str();
 }
 
 scripting::LuaLibrary KeyBindingManager::luaLibrary() {
diff --git a/src/interaction/touchbar.mm b/src/interaction/touchbar.mm
index 32802d4bf9..13603d2247 100644
--- a/src/interaction/touchbar.mm
+++ b/src/interaction/touchbar.mm
@@ -191,14 +191,14 @@ NSArray* focusIdentifiers;
         (void)sender;
         OsEng.scriptEngine().queueScript(
             "local b = openspace.getPropertyValue(\
-                'Global Properties.ImGUI.Main.Enabled'\
+                'Modules.ImGUI.Main.Enabled'\
             );\
             openspace.setPropertyValueSingle(\
-                'Global Properties.ImGUI.Main.Enabled',\
+                'Modules.ImGUI.Main.Enabled',\
                 not b\
             );\
             openspace.setPropertyValueSingle(\
-                'Global Properties.ImGUI.Main.IsHidden',\
+                'Modules.ImGUI.Main.IsHidden',\
                 b\
             );",
             openspace::scripting::ScriptEngine::RemoteScripting::No
@@ -209,32 +209,32 @@ NSArray* focusIdentifiers;
         // Remove unused variable warning
         (void)sender;
         OsEng.scriptEngine().queueScript(
-"local b = openspace.getPropertyValue('Global Properties.ImGUI.Main.Properties.Enabled');\n\
-local c = openspace.getPropertyValue('Global Properties.ImGUI.Main.IsHidden');\n\
-openspace.setPropertyValue('Global Properties.ImGUI.*.Enabled', false);\n\
+"local b = openspace.getPropertyValue('Modules.ImGUI.Main.Properties.Enabled');\n\
+local c = openspace.getPropertyValue('Modules.ImGUI.Main.IsHidden');\n\
+openspace.setPropertyValue('Modules.ImGUI.*.Enabled', false);\n\
 if b and c then\n\
     -- This can happen if the main properties window is enabled, the main gui\n\
     -- is enabled and then closed again. So the main properties window is\n\
     -- enabled, but also all windows are hidden\n\
-    openspace.setPropertyValueSingle('Global Properties.ImGUI.Main.IsHidden', false);\n\
+    openspace.setPropertyValueSingle('Modules.ImGUI.Main.IsHidden', false);\n\
     openspace.setPropertyValueSingle(\n\
-        'Global Properties.ImGUI.Main.Properties.Enabled',\n\
+        'Modules.ImGUI.Main.Properties.Enabled',\n\
         true\n\
     );\n\
     openspace.setPropertyValueSingle(\n\
-        'Global Properties.ImGUI.Main.Space/Time.Enabled',\n\
+        'Modules.ImGUI.Main.Space/Time.Enabled',\n\
         true\n\
     );\n\
 else\n\
     openspace.setPropertyValueSingle(\n\
-        'Global Properties.ImGUI.Main.Properties.Enabled',\n\
+        'Modules.ImGUI.Main.Properties.Enabled',\n\
         not b\n\
     );\n\
     openspace.setPropertyValueSingle(\n\
-        'Global Properties.ImGUI.Main.Space/Time.Enabled',\n\
+        'Modules.ImGUI.Main.Space/Time.Enabled',\n\
         not b\n\
     );\n\
-    openspace.setPropertyValueSingle('Global Properties.ImGUI.Main.IsHidden', b);\n\
+    openspace.setPropertyValueSingle('Modules.ImGUI.Main.IsHidden', b);\n\
 end",
             openspace::scripting::ScriptEngine::RemoteScripting::No
         );
diff --git a/src/properties/propertyowner.cpp b/src/properties/propertyowner.cpp
index 48e61cc081..9bd16dcdc9 100644
--- a/src/properties/propertyowner.cpp
+++ b/src/properties/propertyowner.cpp
@@ -29,6 +29,7 @@
 #include <ghoul/misc/assert.h>
 
 #include <algorithm>
+#include <numeric>
 
 namespace openspace::properties {
 
@@ -38,7 +39,26 @@ namespace {
 
 
 PropertyOwner::PropertyOwner(PropertyOwnerInfo info)
-    : _name(std::move(info.name))
+    : DocumentationGenerator(
+        "Documented",
+        "propertyOwners",
+        {
+            {
+                "mainTemplate",
+                "${WEB}/properties/main.hbs"
+            },
+            {
+                "propertyOwnerTemplate",
+                "${WEB}/properties/propertyowner.hbs"
+            },
+            {
+                "propertyTemplate",
+                "${WEB}/properties/property.hbs"
+            }
+        },
+        "${WEB}/properties/script.js"
+    )
+    , _name(std::move(info.name))
     , _description(std::move(info.description))
     , _owner(nullptr)
 {}
@@ -289,4 +309,62 @@ void PropertyOwner::removeTag(const std::string& tag) {
     );
 }
 
+std::string PropertyOwner::generateJson() const {
+    std::function<std::string(properties::PropertyOwner*)> createJson =
+        [&createJson](properties::PropertyOwner* owner) -> std::string
+    {
+        std::stringstream json;
+        json << "{";
+        json << "\"name\": \"" << owner->name() << "\",";
+
+        json << "\"properties\": [";
+        auto properties = owner->properties();
+        for (properties::Property* p : properties) {
+            json << "{";
+            json << "\"id\": \"" << p->identifier() << "\",";
+            json << "\"type\": \"" << p->className() << "\",";
+            json << "\"fullyQualifiedId\": \"" << p->fullyQualifiedIdentifier() << "\",";
+            json << "\"guiName\": \"" << p->guiName() << "\",";
+            json << "\"description\": \"" << escapedJson(p->description()) << "\"";
+            json << "}";
+            if (p != properties.back()) {
+                json << ",";
+            }
+        }
+        json << "],";
+
+        json << "\"propertyOwners\": [";
+        auto propertyOwners = owner->propertySubOwners();
+        for (properties::PropertyOwner* o : propertyOwners) {
+            json << createJson(o);
+            if (o != propertyOwners.back()) {
+                json << ",";
+            }
+        }
+        json << "]";
+        json << "}";
+
+        return json.str();
+    };
+
+
+    std::stringstream json;
+    json << "[";
+    std::vector<PropertyOwner*> subOwners = propertySubOwners();
+    if (!subOwners.empty()) {
+        json << std::accumulate(
+            std::next(subOwners.begin()),
+            subOwners.end(),
+            createJson(*subOwners.begin()),
+            [createJson](std::string a, PropertyOwner* n) {
+            return a + "," + createJson(n);
+        }
+        );
+    }
+
+    json << "]";
+
+    return json.str();
+}
+
 } // namespace openspace::properties
diff --git a/src/query/query.cpp b/src/query/query.cpp
index 220f3f2c82..9ded69df3a 100644
--- a/src/query/query.cpp
+++ b/src/query/query.cpp
@@ -58,51 +58,15 @@ Renderable* renderable(const std::string& name) {
 }
 
 properties::Property* property(const std::string& uri) {
-    properties::Property* globalProp = OsEng.globalPropertyOwner().property(uri);
-    if (globalProp) {
-        return globalProp;
-    }
-    else {
-        // The URI consists of the following form at this stage:
-        // <node name>.{<property owner>.}^(0..n)<property id>
-        const size_t nameSeparator = uri.find(properties::PropertyOwner::URISeparator);
-        if (nameSeparator == std::string::npos) {
-            LERROR("Malformed URI '" << uri << "': At least one '" << nameSeparator
-                   << "' separator must be present.");
-            return nullptr;
-        }
-        const std::string nameUri = uri.substr(0, nameSeparator);
-        const std::string remainingUri = uri.substr(nameSeparator + 1);
-
-        SceneGraphNode* node = sceneGraphNode(nameUri);
-        if (node) {
-            properties::Property* property = node->property(remainingUri);
-            return property;
-        }
-
-        std::shared_ptr<ScreenSpaceRenderable> ssr =
-            OsEng.renderEngine().screenSpaceRenderable(nameUri);
-        if (ssr) {
-            properties::Property* property = ssr->property(remainingUri);
-            return property;
-        }
-#ifdef OPENSPACE_MODULE_ISWA_ENABLED
-        std::shared_ptr<IswaBaseGroup> group = IswaManager::ref().iswaGroup(nameUri);
-        if(group){
-            properties::Property* property = group->property(remainingUri);
-            return property;
-        }
-#endif
-        LERROR("Node or ScreenSpaceRenderable' " << nameUri << "' did not exist");
-        return nullptr;
-    }
+    properties::Property* property = OsEng.rootPropertyOwner().property(uri);
+    return property;
 }
 
 std::vector<properties::Property*> allProperties() {
     std::vector<properties::Property*> properties;
 
     std::vector<properties::Property*> p =
-        OsEng.globalPropertyOwner().propertiesRecursive();
+        OsEng.rootPropertyOwner().propertiesRecursive();
 
     properties.insert(
         properties.end(),
@@ -110,29 +74,6 @@ std::vector<properties::Property*> allProperties() {
         p.end()
     );
 
-    std::vector<properties::Property*> q =
-        OsEng.virtualPropertyManager().propertiesRecursive();
-
-    properties.insert(
-        properties.end(),
-        q.begin(),
-        q.end()
-    );
-
-    const Scene* graph = sceneGraph();
-    if (graph) {
-        std::vector<SceneGraphNode*> nodes = graph->allSceneGraphNodes();
-
-        for (SceneGraphNode* n : nodes) {
-            std::vector<properties::Property*> props = n->propertiesRecursive();
-            properties.insert(
-                properties.end(),
-                props.begin(),
-                props.end()
-            );
-        }
-    }
-
     return properties;
 }
 
diff --git a/src/scene/scene.cpp b/src/scene/scene.cpp
index 4fbfdc25fc..c98aa31631 100644
--- a/src/scene/scene.cpp
+++ b/src/scene/scene.cpp
@@ -51,7 +51,6 @@
 #include <chrono>
 #include <iostream>
 #include <iterator>
-#include <numeric>
 #include <fstream>
 #include <string>
 #include <stack>
@@ -69,25 +68,7 @@ namespace {
 namespace openspace {
 
 Scene::Scene(std::unique_ptr<SceneInitializer> initializer)
-    : DocumentationGenerator(
-        "Documented",
-        "propertyOwners",
-        {
-            {
-                "mainTemplate",
-                "${WEB}/properties/main.hbs"
-            },
-            {
-                "propertyOwnerTemplate",
-                "${WEB}/properties/propertyowner.hbs"
-            },
-            {
-                "propertyTemplate",
-                "${WEB}/properties/property.hbs"
-            }
-        },
-        "${WEB}/properties/script.js"
-    )
+    : properties::PropertyOwner({"Scene", "Scene"})
     , _dirtyNodeRegistry(false)
     , _initializer(std::move(initializer))
 {
@@ -125,6 +106,7 @@ void Scene::registerNode(SceneGraphNode* node) {
 
     _topologicallySortedNodes.push_back(node);
     _nodesByName[node->name()] = node;
+    addPropertySubOwner(node);
     _dirtyNodeRegistry = true;
 }
 
@@ -138,6 +120,7 @@ void Scene::unregisterNode(SceneGraphNode* node) {
         _topologicallySortedNodes.end()
     );
     _nodesByName.erase(node->name());
+    removePropertySubOwner(node);
     _dirtyNodeRegistry = true;
 }
 
@@ -460,74 +443,6 @@ void Scene::writeSceneLicenseDocumentation(const std::string& path) const {
     writer.writeDocumentation(path);
 }
 
-std::string Scene::generateJson() const {
-    std::function<std::string(properties::PropertyOwner*)> createJson =
-        [&createJson](properties::PropertyOwner* owner) -> std::string
-    {
-        std::stringstream json;
-        json << "{";
-        json << "\"name\": \"" << owner->name() << "\",";
-
-        json << "\"properties\": [";
-        auto properties = owner->properties();
-        for (properties::Property* p : properties) {
-            json << "{";
-            json << "\"id\": \"" << p->identifier() << "\",";
-            json << "\"type\": \"" << p->className() << "\",";
-            json << "\"fullyQualifiedId\": \"" << p->fullyQualifiedIdentifier() << "\",";
-            json << "\"guiName\": \"" << p->guiName() << "\",";
-            json << "\"description\": \"" << escapedJson(p->description()) << "\"";
-            json << "}";
-            if (p != properties.back()) {
-                json << ",";
-            }
-        }
-        json << "],";
-
-        json << "\"propertyOwners\": [";
-        auto propertyOwners = owner->propertySubOwners();
-        for (properties::PropertyOwner* o : propertyOwners) {
-            json << createJson(o);
-            if (o != propertyOwners.back()) {
-                json << ",";
-            }
-        }
-        json << "]";
-        json << "}";
-
-        return json.str();
-    };
-
-
-    std::stringstream json;
-    json << "[";
-    std::vector<SceneGraphNode*> nodes = allSceneGraphNodes();
-    if (!nodes.empty()) {
-        json << std::accumulate(
-            std::next(nodes.begin()),
-            nodes.end(),
-            createJson(*nodes.begin()),
-            [createJson](std::string a, SceneGraphNode* n) {
-            return a + "," + createJson(n);
-        }
-        );
-    }
-
-    json << "]";
-
-    std::string jsonString = "";
-    for (const char& c : json.str()) {
-        if (c == '\'') {
-            jsonString += "\\'";
-        }
-        else {
-            jsonString += c;
-        }
-    }
-
-    return jsonString;
-}
-
 scripting::LuaLibrary Scene::luaLibrary() {
     return {
         "",
diff --git a/src/scripting/scriptengine.cpp b/src/scripting/scriptengine.cpp
index 167c96d26f..3cc2478391 100644
--- a/src/scripting/scriptengine.cpp
+++ b/src/scripting/scriptengine.cpp
@@ -573,17 +573,7 @@ std::string ScriptEngine::generateJson() const {
     }
     json << "]";
 
-    std::string jsonString = "";
-    for (const char& c : json.str()) {
-        if (c == '\'') {
-            jsonString += "\\'";
-        }
-        else {
-            jsonString += c;
-        }
-    }
-
-    return jsonString;
+    return json.str();
 }
 
 bool ScriptEngine::writeLog(const std::string& script) {