diff --git a/build/all.js b/build/all.js
index 1351dd4c..c345e3f9 100644
--- a/build/all.js
+++ b/build/all.js
@@ -3,16 +3,16 @@ goog.provide('og.all');
 goog.require('og');
 goog.require('og.webgl.Handler');
 goog.require('og.Renderer');
-goog.require('og.node.Planet');
-goog.require('og.node.SkyBox');
+goog.require('og.scene.Planet');
+goog.require('og.scene.SkyBox');
 goog.require('og.layer');
 goog.require('og.layer.XYZ');
 goog.require('og.layer.WMS');
 goog.require('og.layer.Vector');
 goog.require('og.layer.CanvasTiles');
 goog.require('og.terrainProvider.TerrainProvider');
-goog.require('og.node.SkyBox');
-goog.require('og.node.Axes');
+goog.require('og.scene.SkyBox');
+goog.require('og.scene.Axes');
 goog.require('og.control.MouseNavigation');
 goog.require('og.control.Sun');
 goog.require('og.control.SimpleNavigation');
diff --git a/examples/Billboards/billboards.js b/examples/Billboards/billboards.js
index 7ab7b083..4b05eb49 100644
--- a/examples/Billboards/billboards.js
+++ b/examples/Billboards/billboards.js
@@ -23,7 +23,7 @@ function main() {
     renderer = new og.Renderer(context);
     renderer.init();
 
-    var axes = new og.node.Axes(10000);
+    var axes = new og.scene.Axes(10000);
 
     scene = new MyScene("Labels");
     renderer.addRenderNode(axes);
@@ -49,7 +49,7 @@ MyScene = function (name) {
     this.texture = null;
 };
 
-og.inheritance.extend(MyScene, og.node.RenderNode);
+og.inheritance.extend(MyScene, og.scene.RenderNode);
 
 MyScene.prototype.initialization = function () {
 
diff --git a/examples/Labels/labels.js b/examples/Labels/labels.js
index 2a12286c..dd714e0a 100644
--- a/examples/Labels/labels.js
+++ b/examples/Labels/labels.js
@@ -23,7 +23,7 @@ function main() {
     renderer = new og.Renderer(context);
     renderer.init();
 
-    var axes = new og.node.Axes(10000);
+    var axes = new og.scene.Axes(10000);
 
     scene = new MyScene("Labels");
     renderer.addRenderNode(axes);
@@ -49,7 +49,7 @@ MyScene = function (name) {
     this.texture = null;
 };
 
-og.inheritance.extend(MyScene, og.node.RenderNode);
+og.inheritance.extend(MyScene, og.scene.RenderNode);
 
 MyScene.prototype.initialization = function () {
 
diff --git a/examples/SeveralViewports/severalViewports.js b/examples/SeveralViewports/severalViewports.js
index fb634a91..bf1cf9f0 100644
--- a/examples/SeveralViewports/severalViewports.js
+++ b/examples/SeveralViewports/severalViewports.js
@@ -1,6 +1,6 @@
 function start() {
 
-    var skybox = new og.node.SkyBox({
+    var skybox = new og.scene.SkyBox({
         "positiveX": "http://www.openglobus.org/resources/images/skyboxes/tycho/px.jpg",
         "negativeX": "http://www.openglobus.org/resources/images/skyboxes/tycho/nx.jpg",
         "positiveY": "http://www.openglobus.org/resources/images/skyboxes/tycho/py.jpg",
diff --git a/examples/WMS/wms.js b/examples/WMS/wms.js
index 63ba7384..b74e512d 100644
--- a/examples/WMS/wms.js
+++ b/examples/WMS/wms.js
@@ -1,6 +1,6 @@
 goog.require('og.webgl.Handler');
 goog.require('og.Renderer');
-goog.require('og.node.Planet');
+goog.require('og.scene.Planet');
 goog.require('og.layer');
 goog.require('og.layer.XYZ');
 goog.require('og.layer.WMS');
@@ -19,7 +19,7 @@ function start() {
     var renderer = new og.Renderer(context);
     renderer.init();
 
-    var planet = new og.node.Planet("Earth", og.ellipsoid.wgs84);
+    var planet = new og.scene.Planet("Earth", og.ellipsoid.wgs84);
 
     var baselayer = new og.layer.XYZ("MapQuest Satellite", { isBaseLayer: true, url: "http://otile1.mqcdn.com/tiles/1.0.0/sat/{zoom}/{tilex}/{tiley}.jpg", visibility: true });
     var states = new og.layer.WMS("USA States", { isBaseLayer: false, url: "../../../geoserver/", layers: "topp:states", opacity: 0.5 });
diff --git a/sandbox/1/main.js b/sandbox/1/main.js
index 91ac4674..0f741321 100644
--- a/sandbox/1/main.js
+++ b/sandbox/1/main.js
@@ -4,7 +4,7 @@ goog.require('og.layer.WMS');
 goog.require('og.layer.Vector');
 goog.require('og.layer.CanvasTiles');
 goog.require('og.terrainProvider.TerrainProvider');
-goog.require('og.node.SkyBox');
+goog.require('og.scene.SkyBox');
 goog.require('og.control.MouseNavigation');
 goog.require('og.control.KeyboardNavigation');
 goog.require('og.control.ToggleWireframe');
@@ -32,7 +32,7 @@ function start() {
     //var states = new og.layer.WMS("USA States", { isBaseLayer: false, url: "http://openglobus.org/geoserver/", layers: "topp:states", opacity: 0.5, zIndex: 50, attribution: 'USA states - geoserver WMS example', transparentColor: [1.0, 1.0, 1.0], visibility: false });
     var terrain = new og.terrainProvider.TerrainProvider("OpenGlobus");
 
-    var skybox = new og.node.SkyBox({
+    var skybox = new og.scene.SkyBox({
         "nx": "http://127.0.0.1/og/resources/images/skyboxes/gal/_nx.jpg",
         "px": "http://127.0.0.1/og/resources/images/skyboxes/gal/_px.jpg",
         "py": "http://127.0.0.1/og/resources/images/skyboxes/gal/_py.jpg",
diff --git a/sandbox/atmosphere/atmosphere.js b/sandbox/atmosphere/atmosphere.js
index dcf52118..ad0024ca 100644
--- a/sandbox/atmosphere/atmosphere.js
+++ b/sandbox/atmosphere/atmosphere.js
@@ -1,6 +1,6 @@
 goog.provide('Atmosphere');
 
-goog.require('og.node.RenderNode');
+goog.require('og.scene.RenderNode');
 goog.require('og.shape.Sphere');
 goog.require('og.math');
 goog.require('og.math.Matrix4');
@@ -39,7 +39,7 @@ Atmosphere = function () {
     this._createData();
 };
 
-og.inheritance.extend(Atmosphere, og.node.RenderNode);
+og.inheritance.extend(Atmosphere, og.scene.RenderNode);
 
 
 Atmosphere.prototype._createData = function () {
diff --git a/sandbox/atmosphere/main.js b/sandbox/atmosphere/main.js
index 58bf9b44..47ceb6a9 100644
--- a/sandbox/atmosphere/main.js
+++ b/sandbox/atmosphere/main.js
@@ -4,7 +4,7 @@ goog.require('og.Renderer');
 goog.require('og.control.SimpleNavigation');
 goog.require('og.shaderProgram.shape_wl');
 goog.require('og.shaderProgram.shape_nl');
-goog.require('og.node.Axes');
+goog.require('og.scene.Axes');
 goog.require('Atmosphere');
 goog.require('og.math.Vector3');
 
@@ -31,7 +31,7 @@ function start() {
     renderer = new og.Renderer(context);
     renderer.init();
 
-    var axes = new og.node.Axes(10000);
+    var axes = new og.scene.Axes(10000);
 
     atmosphere = new Atmosphere();
     renderer.addRenderNode(axes);
diff --git a/sandbox/billboard/billboard.js b/sandbox/billboard/billboard.js
index 0036ec60..873bd175 100644
--- a/sandbox/billboard/billboard.js
+++ b/sandbox/billboard/billboard.js
@@ -1,6 +1,6 @@
 goog.provide('my.Billboard');
 
-goog.require('og.node.RenderNode');
+goog.require('og.scene.RenderNode');
 goog.require('og.inheritance');
 goog.require('og.EntityCollection');
 goog.require('og.Billboard');
@@ -16,7 +16,7 @@ my.Billboard = function (name) {
     this.texture = null;
 };
 
-og.inheritance.extend(my.Billboard, og.node.RenderNode);
+og.inheritance.extend(my.Billboard, og.scene.RenderNode);
 
 
 my.Billboard.prototype.initialization = function () {
diff --git a/sandbox/billboard/main.js b/sandbox/billboard/main.js
index 7f75fb16..776372cd 100644
--- a/sandbox/billboard/main.js
+++ b/sandbox/billboard/main.js
@@ -3,7 +3,7 @@ goog.require('og.Renderer');
 goog.require('og.control.SimpleNavigation');
 goog.require('og.control.ShowFps');
 goog.require('og.shaderProgram');
-goog.require('og.node.Axes');
+goog.require('og.scene.Axes');
 goog.require('my.Billboard');
 goog.require('og.math.Vector3');
 
@@ -30,7 +30,7 @@ function start() {
     renderer = new og.Renderer(context);
     renderer.init();
 
-    var axes = new og.node.Axes(10000);
+    var axes = new og.scene.Axes(10000);
 
     bb = new my.Billboard("Billboard");
     renderer.addRenderNode(axes);
diff --git a/sandbox/earth/main.js b/sandbox/earth/main.js
index 546adbfb..50ef1ad1 100644
--- a/sandbox/earth/main.js
+++ b/sandbox/earth/main.js
@@ -1,6 +1,6 @@
 goog.require('og.Globus');
 goog.require('og.layer.XYZ');
-goog.require('og.node.SkyBox');
+goog.require('og.scene.SkyBox');
 goog.require('og.control.MouseNavigation');
 goog.require('og.control.KeyboardNavigation');
 goog.require('og.control.Sun');
@@ -27,7 +27,7 @@ function init() {
     //http://otile1.mqcdn.com/tiles/1.0.0/sat/{zoom}/{tilex}/{tiley}.jpg
     var sat = new og.layer.XYZ("sat", { isBaseLayer: true, maxZoom:4, url: "http://127.0.0.1/og/sandbox/earth/sat/{zoom}/{tilex}/{tiley}.png", visibility: true, attribution: '<div style="color:white">Powered by <a target="_blank" style="color:blue" href="http://www.openglobus.org">OpenGlobus</a></div>' });
 
-    var skybox = new og.node.SkyBox({
+    var skybox = new og.scene.SkyBox({
         "nx": "http://127.0.0.1/og/resources/images/skyboxes/gal/_nx.jpg",
         "px": "http://127.0.0.1/og/resources/images/skyboxes/gal/_px.jpg",
         "py": "http://127.0.0.1/og/resources/images/skyboxes/gal/_py.jpg",
diff --git a/sandbox/earth/src/htmlPointCollection.js b/sandbox/earth/src/htmlPointCollection.js
index fb14bbb1..83bc1128 100644
--- a/sandbox/earth/src/htmlPointCollection.js
+++ b/sandbox/earth/src/htmlPointCollection.js
@@ -18,7 +18,7 @@ HtmlPointCollection = function () {
     this.selectedPoint = null;
 };
 
-og.inheritance.extend(HtmlPointCollection, og.node.RenderNode);
+og.inheritance.extend(HtmlPointCollection, og.scene.RenderNode);
 
 HtmlPointCollection.prototype.each = function (callback) {
     var i = this._points;
diff --git a/sandbox/heatmap/heatmap.js b/sandbox/heatmap/heatmap.js
index cf03412a..da2b7054 100644
--- a/sandbox/heatmap/heatmap.js
+++ b/sandbox/heatmap/heatmap.js
@@ -1,6 +1,6 @@
 //goog.provide('Heatmap');
 
-//goog.require('og.node.RenderNode');
+//goog.require('og.scene.RenderNode');
 
 Heatmap = function () {
     og.inheritance.base(this);
@@ -12,7 +12,7 @@ Heatmap = function () {
     this.points = [0.6, 0.6, 0.3, 0.7, 0.8, 0.3, 0.2, 0.3, 0.3, 0.1, 0.2, 0.4];
 };
 
-og.inheritance.extend(Heatmap, og.node.RenderNode);
+og.inheritance.extend(Heatmap, og.scene.RenderNode);
 
 Heatmap.prototype.initialization = function () {
     this.drawMode = this.renderer.handler.gl.TRIANGLES;
diff --git a/sandbox/heatmap/main.js b/sandbox/heatmap/main.js
index a98cf0a4..8cc9d5c2 100644
--- a/sandbox/heatmap/main.js
+++ b/sandbox/heatmap/main.js
@@ -3,7 +3,7 @@
 //goog.require('og.Renderer');
 //goog.require('og.control.KeyboardNavigation');
 //goog.require('og.shaderProgram.shape');
-//goog.require('og.node.Axes');
+//goog.require('og.scene.Axes');
 //goog.require('my.Heatmap');
 //goog.require('og.math.Vector3');
 //goog.require('og.utils');
diff --git a/sandbox/linestring/main.js b/sandbox/linestring/main.js
index 788a2ac7..a9d6cc4b 100644
--- a/sandbox/linestring/main.js
+++ b/sandbox/linestring/main.js
@@ -3,7 +3,7 @@ goog.require('og.Renderer');
 goog.require('og.control.SimpleNavigation');
 goog.require('og.control.ShowFps');
 goog.require('og.shaderProgram');
-goog.require('og.node.Axes');
+goog.require('og.scene.Axes');
 goog.require('my.LineString');
 goog.require('og.math.Vector3');
 
@@ -30,7 +30,7 @@ function start() {
     renderer = new og.Renderer(context);
     renderer.init();
 
-    var axes = new og.node.Axes(10000);
+    var axes = new og.scene.Axes(10000);
 
     testNode = new my.LineString("LineString");
     //renderer.addRenderNode(axes);
diff --git a/sandbox/linestring/myLineString.js b/sandbox/linestring/myLineString.js
index d9d82d5f..648502bd 100644
--- a/sandbox/linestring/myLineString.js
+++ b/sandbox/linestring/myLineString.js
@@ -1,6 +1,6 @@
 goog.provide('my.LineString');
 
-goog.require('og.node.RenderNode');
+goog.require('og.scene.RenderNode');
 goog.require('og.inheritance');
 
 goog.require('og.EntityCollection');
@@ -13,7 +13,7 @@ my.LineString = function (name) {
     og.inheritance.base(this, name);
 };
 
-og.inheritance.extend(my.LineString, og.node.RenderNode);
+og.inheritance.extend(my.LineString, og.scene.RenderNode);
 
 my.LineString.prototype.initialization = function () {
 
diff --git a/sandbox/sdf/main.js b/sandbox/sdf/main.js
index 34032ba8..240b505d 100644
--- a/sandbox/sdf/main.js
+++ b/sandbox/sdf/main.js
@@ -3,7 +3,7 @@ goog.require('og.Renderer');
 goog.require('og.control.SimpleNavigation');
 goog.require('og.control.ShowFps');
 goog.require('og.shaderProgram');
-goog.require('og.node.Axes');
+goog.require('og.scene.Axes');
 goog.require('my.SDF');
 goog.require('og.math.Vector3');
 
diff --git a/sandbox/sdf/sdf.js b/sandbox/sdf/sdf.js
index 35ab5e79..3ecf5785 100644
--- a/sandbox/sdf/sdf.js
+++ b/sandbox/sdf/sdf.js
@@ -1,6 +1,6 @@
 goog.provide('my.SDF');
 
-goog.require('og.node.RenderNode');
+goog.require('og.scene.RenderNode');
 goog.require('og.inheritance');
 goog.require('og.webgl.Framebuffer');
 goog.require('og.ImageCanvas');
@@ -20,7 +20,7 @@ my.SDF = function (name) {
 
 };
 
-og.inheritance.extend(my.SDF, og.node.RenderNode);
+og.inheritance.extend(my.SDF, og.scene.RenderNode);
 
 
 my.SDF.prototype.initialization = function () {
diff --git a/sandbox/site/start.js b/sandbox/site/start.js
index 635c2bf8..371a4bb5 100644
--- a/sandbox/site/start.js
+++ b/sandbox/site/start.js
@@ -61,7 +61,7 @@ function start() {
 
     var terrain = new og.terrainProvider.TerrainProvider("OpenGlobus");
 
-    var skybox = new og.node.SkyBox({
+    var skybox = new og.scene.SkyBox({
         "nx": "resources/images/skyboxes/gal/_nx.jpg",
         "px": "resources/images/skyboxes/gal/_px.jpg",
         "py": "resources/images/skyboxes/gal/_py.jpg",
diff --git a/src/og/camera/planetCamera.js b/src/og/camera/planetCamera.js
index 7e16c03a..90dbda01 100644
--- a/src/og/camera/planetCamera.js
+++ b/src/og/camera/planetCamera.js
@@ -24,7 +24,7 @@ og.PlanetCamera = function (planet, options) {
     /**
      * Assigned camera's planet.
      * @public
-     * @type {og.node.Planet}
+     * @type {og.scene.Planet}
      */
     this.planet = planet;
 
diff --git a/src/og/control/sun.js b/src/og/control/sun.js
index 19055aa8..8eeebae4 100644
--- a/src/og/control/sun.js
+++ b/src/og/control/sun.js
@@ -18,7 +18,7 @@ og.control.Sun = function (options) {
     /**
      * Earth planet node.
      * @public
-     * @type {og.node.Planet}
+     * @type {og.scene.Planet}
      */
     this.planet;
 
diff --git a/src/og/entity/entityCollection.js b/src/og/entity/entityCollection.js
index c2f11059..09da210d 100644
--- a/src/og/entity/entityCollection.js
+++ b/src/og/entity/entityCollection.js
@@ -70,7 +70,7 @@ og.EntityCollection = function (options) {
     /**
      * Render node context.
      * @public
-     * @type {og.node.RenderNode}
+     * @type {og.scene.RenderNode}
      */
     this.renderNode = null;
 
@@ -572,7 +572,7 @@ og.EntityCollection.prototype.reindexEntitiesArray = function (startIndex) {
 /**
  * Adds this collection to render node.
  * @public
- * @param {og.node.RenderNode} renderNode - Render node.
+ * @param {og.scene.RenderNode} renderNode - Render node.
  * @param {boolean} [isHidden] - Uses in vector layers that render in planet render specific function.
  * @returns {og.EntityCollection}
  */
diff --git a/src/og/globus.js b/src/og/globus.js
index 0e22165a..7303bb60 100644
--- a/src/og/globus.js
+++ b/src/og/globus.js
@@ -2,8 +2,8 @@ goog.provide('og.Globus');
 
 goog.require('og.webgl.Handler');
 goog.require('og.Renderer');
-goog.require('og.node.Planet');
-goog.require('og.node.PlanetAtmosphere');
+goog.require('og.scene.Planet');
+goog.require('og.scene.PlanetAtmosphere');
 goog.require('og.ellipsoid.wgs84');
 goog.require('og.terrainProvider.EmptyTerrainProvider');
 
@@ -95,11 +95,11 @@ og.Globus = function (options) {
         /**
          * Render node renders a planet.
          * @public
-         * @type {og.node.Planet|og.node.PlanetAtmosphere}
+         * @type {og.scene.Planet|og.scene.PlanetAtmosphere}
          */
-        this.planet = new og.node.PlanetAtmosphere(this._planetName, options.ellipsoid ? options.ellipsoid : og.ellipsoid.wgs84);
+        this.planet = new og.scene.PlanetAtmosphere(this._planetName, options.ellipsoid ? options.ellipsoid : og.ellipsoid.wgs84);
     } else {
-        this.planet = new og.node.Planet(this._planetName, options.ellipsoid ? options.ellipsoid : og.ellipsoid.wgs84);
+        this.planet = new og.scene.Planet(this._planetName, options.ellipsoid ? options.ellipsoid : og.ellipsoid.wgs84);
     }
 
     //Attach terrain provider
diff --git a/src/og/layer/layer.js b/src/og/layer/layer.js
index ebcddb4d..f4f42706 100644
--- a/src/og/layer/layer.js
+++ b/src/og/layer/layer.js
@@ -70,7 +70,7 @@ og.layer.Layer = function (name, options) {
     /**
      * Planet node.
      * @protected
-     * @type {og.node.Planet}
+     * @type {og.scene.Planet}
      */
     this._planet = null;
 
@@ -162,7 +162,7 @@ og.layer.Layer.prototype.isEqual = function (layer) {
 /**
  * Assign the planet.
  * @protected
- * @param {og.node.Planet} planet- Planet render node.
+ * @param {og.scene.Planet} planet- Planet render node.
  */
 og.layer.Layer.prototype._assignPlanet = function (planet) {
     planet.layers.push(this);
@@ -179,7 +179,7 @@ og.layer.Layer.prototype._assignPlanet = function (planet) {
 /**
  * Adds layer to the planet.
  * @public
- * @param {og.node.Planet}
+ * @param {og.scene.Planet}
  */
 og.layer.Layer.prototype.addTo = function (planet) {
     this._assignPlanet(planet);
diff --git a/src/og/light/lightSource.js b/src/og/light/lightSource.js
index 1c414abb..3283a32b 100644
--- a/src/og/light/lightSource.js
+++ b/src/og/light/lightSource.js
@@ -26,7 +26,7 @@ og.LightSource = function (name, params) {
     /**
      * Render node where light is shines.
      * @protected
-     * @type {og.node.RenderNode}
+     * @type {og.scene.RenderNode}
      */
     this._renderNode = null;
 
@@ -267,7 +267,7 @@ og.LightSource.prototype.setBlack = function () {
 /**
  * Adds current light to the render node scene.
  * @public
- * @param {og.node.RenderNode} renderNode - Render node scene.
+ * @param {og.scene.RenderNode} renderNode - Render node scene.
  * @returns {og.LightSource}
  */
 og.LightSource.prototype.addTo = function (renderNode) {
diff --git a/src/og/node/node.jsdoc b/src/og/node/node.jsdoc
deleted file mode 100644
index a11335a1..00000000
--- a/src/og/node/node.jsdoc
+++ /dev/null
@@ -1,3 +0,0 @@
-/**
- * @namespace og.node
- */
\ No newline at end of file
diff --git a/src/og/og-deps.js b/src/og/og-deps.js
index 88a17987..1d2c27de 100644
--- a/src/og/og-deps.js
+++ b/src/og/og-deps.js
@@ -42,7 +42,7 @@ goog.addDependency('../../../og/src/og/events/events.js', ['og.Events'], [], fal
 goog.addDependency('../../../og/src/og/extent/extent.js', ['og.Extent', 'og.extent'], ['og.LonLat', 'og.math'], false);
 goog.addDependency('../../../og/src/og/frustum.js', ['og.Frustum'], [], false);
 goog.addDependency('../../../og/src/og/geoImage.js', ['og.GeoImage'], ['og.Events', 'og.Extent', 'og.LonLat', 'og.mercator'], false);
-goog.addDependency('../../../og/src/og/globus.js', ['og.Globus'], ['og.Renderer', 'og.ellipsoid.wgs84', 'og.node.Planet', 'og.node.PlanetAtmosphere', 'og.terrainProvider.EmptyTerrainProvider', 'og.webgl.Handler'], false);
+goog.addDependency('../../../og/src/og/globus.js', ['og.Globus'], ['og.Renderer', 'og.ellipsoid.wgs84', 'og.scene.Planet', 'og.scene.PlanetAtmosphere', 'og.terrainProvider.EmptyTerrainProvider', 'og.webgl.Handler'], false);
 goog.addDependency('../../../og/src/og/imageCanvas/imageCanvas.js', ['og.ImageCanvas'], [], false);
 goog.addDependency('../../../og/src/og/inheritance.js', ['og.inheritance'], [], false);
 goog.addDependency('../../../og/src/og/input/input.js', ['og.input'], [], false);
@@ -67,13 +67,6 @@ goog.addDependency('../../../og/src/og/math/vector2.js', ['og.math.Vector2'], ['
 goog.addDependency('../../../og/src/og/math/vector3.js', ['og.math.Vector3'], [], false);
 goog.addDependency('../../../og/src/og/math/vector4.js', ['og.math.Vector4'], ['og.math', 'og.math.Vector3'], false);
 goog.addDependency('../../../og/src/og/mercator.js', ['og.mercator'], [], false);
-goog.addDependency('../../../og/src/og/node/axes.js', ['og.node.Axes'], ['og.inheritance', 'og.node.RenderNode'], false);
-goog.addDependency('../../../og/src/og/node/node.js', ['og.node.Node'], [], false);
-goog.addDependency('../../../og/src/og/node/planet.js', ['og.node.Planet'], ['og.Extent', 'og.GeoImage', 'og.ImageCanvas', 'og.LonLat', 'og.PlanetCamera', 'og.PlanetSegmentHelper', 'og.bv.Sphere', 'og.ellipsoid.wgs84', 'og.inheritance', 'og.layer', 'og.math', 'og.math.Matrix4', 'og.math.Ray', 'og.math.Vector2', 'og.math.Vector3', 'og.math.coder', 'og.mercator', 'og.node.RenderNode', 'og.planetSegment', 'og.planetSegment.GeoImageTileCreatorQueue', 'og.planetSegment.NormalMapCreatorQueue', 'og.planetSegment.Segment', 'og.planetSegment.SegmentWGS84', 'og.proj.EPSG4326', 'og.quadTree', 'og.quadTree.QuadNode', 'og.shaderProgram.heightPicking', 'og.shaderProgram.overlays_nl', 'og.shaderProgram.overlays_wl', 'og.shaderProgram.single_nl', 'og.shaderProgram.single_wl', 'og.webgl', 'og.webgl.Framebuffer'], false);
-goog.addDependency('../../../og/src/og/node/planetAtmosphere.js', ['og.node.PlanetAtmosphere'], ['og.inheritance', 'og.shaderProgram.atmosphereSpace', 'og.shaderProgram.overlaysAtmosphere_wl', 'og.shaderProgram.overlays_nl', 'og.shaderProgram.singleAtmosphere_wl', 'og.shaderProgram.single_nl', 'og.shape.Icosphere'], false);
-goog.addDependency('../../../og/src/og/node/renderNode.js', ['og.node.RenderNode'], ['og.Events', 'og.inheritance', 'og.math.Matrix4', 'og.math.Vector3', 'og.node.Node', 'og.utils.FontAtlas', 'og.utils.TextureAtlas', 'og.webgl'], false);
-goog.addDependency('../../../og/src/og/node/skyBox.js', ['og.node.SkyBox'], ['og.inheritance', 'og.node.RenderNode', 'og.shaderProgram.skybox'], false);
-goog.addDependency('../../../og/src/og/node/skySphere.js', ['og.node.SkySphere'], ['og.inheritance', 'og.node.RenderNode', 'og.shaderProgram.skysphere'], false);
 goog.addDependency('../../../og/src/og/og.js', ['og'], [], false);
 goog.addDependency('../../../og/src/og/planetSegment/GeoImageTileCreatorQueue.js', ['og.planetSegment.GeoImageTileCreatorQueue'], ['og.QueueArray', 'og.inheritance', 'og.utils.GeoImageTileCreator'], false);
 goog.addDependency('../../../og/src/og/planetSegment/NormalMapCreatorQueue.js', ['og.planetSegment.NormalMapCreatorQueue'], ['og.QueueArray', 'og.inheritance', 'og.utils.NormalMapCreator'], false);
@@ -91,6 +84,13 @@ goog.addDependency('../../../og/src/og/queueArray.js', ['og.QueueArray'], [], fa
 goog.addDependency('../../../og/src/og/rectangle.js', ['og.Rectangle'], [], false);
 goog.addDependency('../../../og/src/og/renderer/renderer.js', ['og.Renderer'], ['og.Camera', 'og.RendererEvents', 'og.math.Pixel', 'og.math.Vector3', 'og.utils'], false);
 goog.addDependency('../../../og/src/og/renderer/rendererEvents.js', ['og.RendererEvents'], ['og.Events', 'og.inheritance', 'og.input', 'og.input.KeyboardHandler', 'og.input.MouseHandler', 'og.input.TouchHandler', 'og.math.Pixel'], false);
+goog.addDependency('../../../og/src/og/scene/axes.js', ['og.scene.Axes'], ['og.inheritance', 'og.scene.RenderNode'], false);
+goog.addDependency('../../../og/src/og/scene/node.js', ['og.scene.Node'], [], false);
+goog.addDependency('../../../og/src/og/scene/planet.js', ['og.scene.Planet'], ['og.Extent', 'og.GeoImage', 'og.ImageCanvas', 'og.LonLat', 'og.PlanetCamera', 'og.PlanetSegmentHelper', 'og.bv.Sphere', 'og.ellipsoid.wgs84', 'og.inheritance', 'og.layer', 'og.math', 'og.math.Matrix4', 'og.math.Ray', 'og.math.Vector2', 'og.math.Vector3', 'og.math.coder', 'og.mercator', 'og.planetSegment', 'og.planetSegment.GeoImageTileCreatorQueue', 'og.planetSegment.NormalMapCreatorQueue', 'og.planetSegment.Segment', 'og.planetSegment.SegmentWGS84', 'og.proj.EPSG4326', 'og.quadTree', 'og.quadTree.QuadNode', 'og.scene.RenderNode', 'og.shaderProgram.heightPicking', 'og.shaderProgram.overlays_nl', 'og.shaderProgram.overlays_wl', 'og.shaderProgram.single_nl', 'og.shaderProgram.single_wl', 'og.webgl', 'og.webgl.Framebuffer'], false);
+goog.addDependency('../../../og/src/og/scene/planetAtmosphere.js', ['og.scene.PlanetAtmosphere'], ['og.inheritance', 'og.shaderProgram.atmosphereSpace', 'og.shaderProgram.overlaysAtmosphere_wl', 'og.shaderProgram.overlays_nl', 'og.shaderProgram.singleAtmosphere_wl', 'og.shaderProgram.single_nl', 'og.shape.Icosphere'], false);
+goog.addDependency('../../../og/src/og/scene/renderNode.js', ['og.scene.RenderNode'], ['og.Events', 'og.inheritance', 'og.math.Matrix4', 'og.math.Vector3', 'og.scene.Node', 'og.utils.FontAtlas', 'og.utils.TextureAtlas', 'og.webgl'], false);
+goog.addDependency('../../../og/src/og/scene/skyBox.js', ['og.scene.SkyBox'], ['og.inheritance', 'og.scene.RenderNode', 'og.shaderProgram.skybox'], false);
+goog.addDependency('../../../og/src/og/scene/skySphere.js', ['og.scene.SkySphere'], ['og.inheritance', 'og.scene.RenderNode', 'og.shaderProgram.skysphere'], false);
 goog.addDependency('../../../og/src/og/shaderProgram/atmosphereSpace.js', ['og.shaderProgram.atmosphereSpace'], ['og.shaderProgram', 'og.shaderProgram.ShaderProgram', 'og.shaderProgram.types', 'og.utils'], false);
 goog.addDependency('../../../og/src/og/shaderProgram/billboard.js', ['og.shaderProgram.billboard', 'og.shaderProgram.billboardPicking'], ['og.shaderProgram', 'og.shaderProgram.ShaderProgram', 'og.shaderProgram.types', 'og.utils'], false);
 goog.addDependency('../../../og/src/og/shaderProgram/callbacks.js', ['og.shaderProgram.callbacks'], ['og.shaderProgram.types'], false);
diff --git a/src/og/quadTree/quadNode.js b/src/og/quadTree/quadNode.js
index 87fa7316..4455d9f9 100644
--- a/src/og/quadTree/quadNode.js
+++ b/src/og/quadTree/quadNode.js
@@ -11,7 +11,7 @@ goog.require('og.mercator');
  * Quad tree planet segment node.
  * @constructor
  * @param {og.planetSegment.Segment|og.planetSegment.SegmentWGS84} segmentPrototype - Planet segment node constructor.
- * @param {og.node.RenderNode} planet - Planet render node.
+ * @param {og.scene.RenderNode} planet - Planet render node.
  * @param {number} partId - NorthEast, SouthWest etc.
  * @param {og.quadTree.QuadNode} parent - Parent of this node.
  * @param {number} id - Tree node identifier (id * 4 + 1);
diff --git a/src/og/renderer/renderer.js b/src/og/renderer/renderer.js
index 43e37fe2..9a67c251 100644
--- a/src/og/renderer/renderer.js
+++ b/src/og/renderer/renderer.js
@@ -57,14 +57,14 @@ og.Renderer = function (handler) {
     /**
      * Render nodes drawing queue.
      * @private
-     * @type {Array.<og.node.RenderNode>}
+     * @type {Array.<og.scene.RenderNode>}
      */
     this._renderNodesArr = [];
 
     /**
      * Render nodes store for the comfortable access by the node name.
      * @public
-     * @type {Object.<og.node.RenderNode>}
+     * @type {Object.<og.scene.RenderNode>}
      */
     this.renderNodes = {};
 
@@ -272,7 +272,7 @@ og.Renderer.prototype.init = function () {
 /**
  * Adds render node to the renderer.
  * @public
- * @param {og.node.RenderNode} renderNode - Render node.
+ * @param {og.scene.RenderNode} renderNode - Render node.
  */
 og.Renderer.prototype.addRenderNode = function (renderNode) {
     if (!this.renderNodes[renderNode.name]) {
@@ -287,7 +287,7 @@ og.Renderer.prototype.addRenderNode = function (renderNode) {
 /**
  * Adds render nodes array to the renderer.
  * @public
- * @param {Array.<og.node.RenderNode>} nodesArr - Render nodes array.
+ * @param {Array.<og.scene.RenderNode>} nodesArr - Render nodes array.
  */
 og.Renderer.prototype.addRenderNodes = function (nodesArr) {
     for (var i = 0; i < nodesArr; i++) {
diff --git a/src/og/node/axes.js b/src/og/scene/axes.js
similarity index 76%
rename from src/og/node/axes.js
rename to src/og/scene/axes.js
index 9206abb4..aecfdca2 100644
--- a/src/og/node/axes.js
+++ b/src/og/scene/axes.js
@@ -1,24 +1,24 @@
-goog.provide('og.node.Axes');
+goog.provide('og.scene.Axes');
 
 
 goog.require('og.inheritance');
-goog.require('og.node.RenderNode');
+goog.require('og.scene.RenderNode');
 
-og.node.Axes = function (size) {
+og.scene.Axes = function (size) {
     og.inheritance.base(this, "Axes");
     this.size = size;
     this.axesBuffer = null;
     this.axesColorBuffer = null;
 };
 
-og.inheritance.extend(og.node.Axes, og.node.RenderNode);
+og.inheritance.extend(og.scene.Axes, og.scene.RenderNode);
 
-og.node.Axes.prototype.initialization = function () {
+og.scene.Axes.prototype.initialization = function () {
     this.createAxisBuffer(this.size);
     this.drawMode = this.renderer.handler.gl.LINES;
 };
 
-og.node.Axes.prototype.frame = function () {
+og.scene.Axes.prototype.frame = function () {
 
     this.renderer.handler.shaderPrograms.flat.activate();
 
@@ -31,7 +31,7 @@ og.node.Axes.prototype.frame = function () {
     this.renderer.handler.shaderPrograms.flat.drawArray(this.drawMode, this.axisBuffer.numItems);
 };
 
-og.node.Axes.prototype.createAxisBuffer = function (gridSize) {
+og.scene.Axes.prototype.createAxisBuffer = function (gridSize) {
 
     var vertices = [
          0.0, 0.0, 0.0, gridSize - 1, 0.0, 0.0, // x - R
diff --git a/src/og/node/node.js b/src/og/scene/node.js
similarity index 65%
rename from src/og/node/node.js
rename to src/og/scene/node.js
index 3b7721d9..03cfcaaa 100644
--- a/src/og/node/node.js
+++ b/src/og/scene/node.js
@@ -1,23 +1,23 @@
-goog.provide('og.node.Node');
+goog.provide('og.scene.Node');
 
 /**
- * Node base class.
+ * Scene node base class.
  * @class
  * @param {string} name - Node name.
  */
-og.node.Node = function (name) {
+og.scene.Node = function (name) {
     this.name = name;
     this.topNode = this;
     this.dictionary = [];
     this.dictionary[name] = this;
     this.childNodes = [];
     this.parentNode = null;
-    this.__staticId = og.node.Node.staticCounter++;
+    this.__staticId = og.scene.Node.staticCounter++;
 };
 
-og.node.Node.staticCounter = 0;
+og.scene.Node.staticCounter = 0;
 
-og.node.Node.prototype = {
+og.scene.Node.prototype = {
     name: "",
     childNodes: [],
     parentNode: null,
@@ -25,7 +25,7 @@ og.node.Node.prototype = {
     dictionary: []
 };
 
-og.node.Node.prototype.addNode = function (node) {
+og.scene.Node.prototype.addNode = function (node) {
     if (this.parentNode == null) {
         node.topNode = this;
     }
@@ -38,20 +38,20 @@ og.node.Node.prototype.addNode = function (node) {
     this.topNode.dictionary[node.name] = node;
 };
 
-og.node.Node.prototype.destroy = function () {
+og.scene.Node.prototype.destroy = function () {
     for (var i = 0; i < this.childNodes.length; i++) {
         this.childNodes[i].destroy();
     }
     this._clear();
 };
 
-og.node.Node.prototype._clear = function () {
+og.scene.Node.prototype._clear = function () {
     this.name = "";
     this.parentNode = null;
     this.topNode = null;
     this.childNodes.length = 0;
 };
 
-og.node.Node.prototype.getNodeByName = function (name) {
+og.scene.Node.prototype.getNodeByName = function (name) {
     return this.dictionary[name];
 };
\ No newline at end of file
diff --git a/src/og/node/planet.js b/src/og/scene/planet.js
similarity index 87%
rename from src/og/node/planet.js
rename to src/og/scene/planet.js
index f5ead824..96549cdb 100644
--- a/src/og/node/planet.js
+++ b/src/og/scene/planet.js
@@ -1,7 +1,7 @@
-goog.provide('og.node.Planet');
+goog.provide('og.scene.Planet');
 
 goog.require('og.inheritance');
-goog.require('og.node.RenderNode');
+goog.require('og.scene.RenderNode');
 goog.require('og.math');
 goog.require('og.math.Matrix4');
 goog.require('og.math.Vector3');
@@ -38,7 +38,7 @@ goog.require('og.ellipsoid.wgs84');
 /**
  * Main class for rendering planet
  * @class
- * @extends {og.node.RenderNode}
+ * @extends {og.scene.RenderNode}
  * @param {string} name - Planet name(Earth by default)
  * @param {og.Ellipsoid} ellipsoid - Planet ellipsoid(WGS84 by default)
  * @fires og.Event#draw
@@ -48,7 +48,7 @@ goog.require('og.ellipsoid.wgs84');
  * @fires og.Event#layervisibilitychange
  * @fires og.Event#geoimageadd
  */
-og.node.Planet = function (name, ellipsoid) {
+og.scene.Planet = function (name, ellipsoid) {
     og.inheritance.base(this, name);
 
     /**
@@ -298,10 +298,10 @@ og.node.Planet = function (name, ellipsoid) {
     this._useSpecularTexture = true;
 
     //events initialization
-    this.events.registerNames(og.node.Planet.EVENT_NAMES);
+    this.events.registerNames(og.scene.Planet.EVENT_NAMES);
 };
 
-og.inheritance.extend(og.node.Planet, og.node.RenderNode);
+og.inheritance.extend(og.scene.Planet, og.scene.RenderNode);
 
 /**
  * Maximum created nodes count. The more nodes count the more memory usage.
@@ -309,9 +309,9 @@ og.inheritance.extend(og.node.Planet, og.node.RenderNode);
  * @const
  * @type {number}
  */
-og.node.Planet.MAX_NODES = 250;
+og.scene.Planet.MAX_NODES = 250;
 
-og.node.Planet.EVENT_NAMES = [
+og.scene.Planet.EVENT_NAMES = [
         /**
          * Triggered before globe frame begins to render.
          * @event og.Events#draw
@@ -353,9 +353,9 @@ og.node.Planet.EVENT_NAMES = [
  * @type {string}
  * @const
  */
-og.node.Planet.defaultEmptyColor = "#C5C5C5";
+og.scene.Planet.defaultEmptyColor = "#C5C5C5";
 
-og.node.Planet.prototype.createDefaultTexture = function (params) {
+og.scene.Planet.prototype.createDefaultTexture = function (params) {
     var imgCnv;
     var texture;
     if (params && params.color) {
@@ -371,7 +371,7 @@ og.node.Planet.prototype.createDefaultTexture = function (params) {
         });
     } else {
         imgCnv = new og.ImageCanvas(2, 2);
-        imgCnv.fillColor(og.node.Planet.defaultEmptyColor);
+        imgCnv.fillColor(og.scene.Planet.defaultEmptyColor);
         texture = this.renderer.handler.createTexture(imgCnv._canvas);
     }
     texture.default = true;
@@ -384,7 +384,7 @@ og.node.Planet.prototype.createDefaultTexture = function (params) {
  * @public
  * @returns {og.layer.Layer}
  */
-og.node.Planet.prototype.getLayerByName = function (name) {
+og.scene.Planet.prototype.getLayerByName = function (name) {
     var i = this.layers.length;
     while (i--) {
         if (this.layers[i].name === name)
@@ -393,7 +393,7 @@ og.node.Planet.prototype.getLayerByName = function (name) {
     return undefined;
 };
 
-og.node.Planet.prototype.addGeoImage = function (geoImage) {
+og.scene.Planet.prototype.addGeoImage = function (geoImage) {
     geoImage.addTo(this);
 };
 
@@ -402,7 +402,7 @@ og.node.Planet.prototype.addGeoImage = function (geoImage) {
  * @param {og.layer.Layer} layer - Layer object.
  * @public
  */
-og.node.Planet.prototype.addLayer = function (layer) {
+og.scene.Planet.prototype.addLayer = function (layer) {
     layer.addTo(this);
 };
 
@@ -411,7 +411,7 @@ og.node.Planet.prototype.addLayer = function (layer) {
  * @param {og.layer.Layer} layer - Changed layer.
  * @protected
  */
-og.node.Planet.prototype._onLayerVisibilityChanged = function (layer) {
+og.scene.Planet.prototype._onLayerVisibilityChanged = function (layer) {
     this.events.dispatch(this.events.layervisibilitychange, layer);
 };
 
@@ -420,7 +420,7 @@ og.node.Planet.prototype._onLayerVisibilityChanged = function (layer) {
  * @param {Array.<og.layer.Layer>} layers - Layers array.
  * @public
  */
-og.node.Planet.prototype.addLayers = function (layers) {
+og.scene.Planet.prototype.addLayers = function (layers) {
     for (var i = 0; i < layers.length; i++) {
         this.addLayer(layers[i]);
     }
@@ -432,7 +432,7 @@ og.node.Planet.prototype.addLayers = function (layers) {
  * @return {og.layer.Layer|undefined} The removed layer or undefined if the layer was not found.
  * @public
  */
-og.node.Planet.prototype.removeLayer = function (layer) {
+og.scene.Planet.prototype.removeLayer = function (layer) {
     var lid = layer._id;
     for (var i = 0; i < this.layers.length; i++) {
         if (this.layers[i]._id == lid) {
@@ -458,7 +458,7 @@ og.node.Planet.prototype.removeLayer = function (layer) {
  * Redraw geo images.
  * @public
  */
-og.node.Planet.prototype.redrawGeoImages = function () {
+og.scene.Planet.prototype.redrawGeoImages = function () {
     this.geoImagesArray.sort(function (a, b) {
         return b.zIndex - a.zIndex;
     });
@@ -476,7 +476,7 @@ og.node.Planet.prototype.redrawGeoImages = function () {
  * @return {Array.<og.layer.Layer>} Layers.
  * @public
  */
-og.node.Planet.prototype.getLayers = function () {
+og.scene.Planet.prototype.getLayers = function () {
     return this.layers;
 };
 
@@ -485,7 +485,7 @@ og.node.Planet.prototype.getLayers = function () {
  * @param {og.layer.Layer} layer - Layer object.
  * @public
  */
-og.node.Planet.prototype.setBaseLayer = function (layer) {
+og.scene.Planet.prototype.setBaseLayer = function (layer) {
     if (this.baseLayer) {
         if (!this.baseLayer.isEqual(layer)) {
             this.baseLayer.setVisibility(false);
@@ -504,7 +504,7 @@ og.node.Planet.prototype.setBaseLayer = function (layer) {
  * Sets elevation scale. 1.0 is default.
  * @param {number} factor - Elevation scale.
  */
-og.node.Planet.prototype.setHeightFactor = function (factor) {
+og.scene.Planet.prototype.setHeightFactor = function (factor) {
     if (this._heightFactor !== factor) {
         this._heightFactor = factor;
         this._quadTree.reloadTerrain();
@@ -515,7 +515,7 @@ og.node.Planet.prototype.setHeightFactor = function (factor) {
  * Gets elevation scale.
  * @returns {number}
  */
-og.node.Planet.prototype.getHeightFactor = function () {
+og.scene.Planet.prototype.getHeightFactor = function () {
     return this._heightFactor;
 };
 
@@ -524,7 +524,7 @@ og.node.Planet.prototype.getHeightFactor = function () {
  * @public
  * @param {og.terrainProvider.TerrainProvider} terrain - Terrain provider.
  */
-og.node.Planet.prototype.setTerrainProvider = function (terrain) {
+og.scene.Planet.prototype.setTerrainProvider = function (terrain) {
     this.terrainProvider = terrain;
 };
 
@@ -532,7 +532,7 @@ og.node.Planet.prototype.setTerrainProvider = function (terrain) {
  * @virtual
  * @protected
  */
-og.node.Planet.prototype._initializeShaders = function () {
+og.scene.Planet.prototype._initializeShaders = function () {
     this.renderer.handler.addShaderProgram(og.shaderProgram.single_nl(), true);
     this.renderer.handler.addShaderProgram(og.shaderProgram.single_wl(), true);
     this.renderer.handler.addShaderProgram(og.shaderProgram.overlays_nl(), true);
@@ -544,7 +544,7 @@ og.node.Planet.prototype._initializeShaders = function () {
  * @virtual
  * @public
  */
-og.node.Planet.prototype.initialization = function () {
+og.scene.Planet.prototype.initialization = function () {
     //Initialization indexes table
     og.PlanetSegmentHelper.initIndexesTables(6);
 
@@ -649,7 +649,7 @@ og.node.Planet.prototype.initialization = function () {
  * @param{object} param0
  * @param{object} param1
  */
-og.node.Planet.prototype.createDefaultTextures = function (param0, param1) {
+og.scene.Planet.prototype.createDefaultTextures = function (param0, param1) {
     this.renderer.handler.gl.deleteTexture(this.solidTextureOne);
     this.renderer.handler.gl.deleteTexture(this.solidTextureTwo);
     this.solidTextureOne = this.createDefaultTexture(param0);
@@ -660,7 +660,7 @@ og.node.Planet.prototype.createDefaultTextures = function (param0, param1) {
  * Updates attribution lists
  * @public
  */
-og.node.Planet.prototype.updateAttributionsList = function () {
+og.scene.Planet.prototype.updateAttributionsList = function () {
     var html = "";
     for (var i = 0; i < this.layers.length; i++) {
         var li = this.layers[i];
@@ -686,7 +686,7 @@ og.node.Planet.prototype.updateAttributionsList = function () {
  * Updates visible layers.
  * @public
  */
-og.node.Planet.prototype.updateVisibleLayers = function () {
+og.scene.Planet.prototype.updateVisibleLayers = function () {
     this.visibleTileLayers = [];
     this.visibleTileLayers.length = 0;
 
@@ -730,7 +730,7 @@ og.node.Planet.prototype.updateVisibleLayers = function () {
  * Sort visible layer preparing for rendering.
  * @protected
  */
-og.node.Planet.prototype._sortVisibleLayersByZIndex = function () {
+og.scene.Planet.prototype._sortVisibleLayersByZIndex = function () {
 
     this.visibleTileLayers.sort(function (a, b) {
         return a._isBaseLayer ? -1 : a._zIndex - b._zIndex;
@@ -745,7 +745,7 @@ og.node.Planet.prototype._sortVisibleLayersByZIndex = function () {
  * Collects visible quad nodes.
  * @protected
  */
-og.node.Planet.prototype._collectRenderNodes = function () {
+og.scene.Planet.prototype._collectRenderNodes = function () {
 
     //clear first
     this._renderedNodes.length = 0;
@@ -773,7 +773,7 @@ og.node.Planet.prototype._collectRenderNodes = function () {
  * Render node callback.
  * @public
  */
-og.node.Planet.prototype.frame = function () {
+og.scene.Planet.prototype.frame = function () {
 
     var cam = this.renderer.activeCamera;
 
@@ -796,7 +796,7 @@ og.node.Planet.prototype.frame = function () {
 
     //free memory
     var that = this;
-    if (this._createdNodesCount > og.node.Planet.MAX_NODES) {
+    if (this._createdNodesCount > og.scene.Planet.MAX_NODES) {
         setTimeout(function () {
             that.memClear();
         }, 0);
@@ -808,7 +808,7 @@ og.node.Planet.prototype.frame = function () {
  * @virtual
  * @protected
  */
-og.node.Planet.prototype._rendering = function () {
+og.scene.Planet.prototype._rendering = function () {
     this._renderNodesPASS();
     this._renderHeightBackbufferPASS();
     this._renderVectorLayersPASS();
@@ -818,7 +818,7 @@ og.node.Planet.prototype._rendering = function () {
  * @virtual
  * @protected
  */
-og.node.Planet.prototype._drawOverlays = function () {
+og.scene.Planet.prototype._drawOverlays = function () {
     var sh;
     var renderer = this.renderer;
     var h = renderer.handler;
@@ -885,7 +885,7 @@ og.node.Planet.prototype._drawOverlays = function () {
  * @virtual
  * @protected
  */
-og.node.Planet.prototype._drawSingle = function () {
+og.scene.Planet.prototype._drawSingle = function () {
     var sh;
     var renderer = this.renderer;
     var h = renderer.handler;
@@ -934,7 +934,7 @@ og.node.Planet.prototype._drawSingle = function () {
 /**
  * @protected
  */
-og.node.Planet.prototype._renderNodesPASS = function () {
+og.scene.Planet.prototype._renderNodesPASS = function () {
     if (this.visibleTileLayers.length > 1) {
         this._drawOverlays();
     } else {
@@ -945,7 +945,7 @@ og.node.Planet.prototype._renderNodesPASS = function () {
 /**
  * @protected
  */
-og.node.Planet.prototype._renderHeightBackbufferPASS = function () {
+og.scene.Planet.prototype._renderHeightBackbufferPASS = function () {
     var b = this._heightBackbuffer,
         r = this.renderer;
     var h = r.handler;
@@ -968,7 +968,7 @@ og.node.Planet.prototype._renderHeightBackbufferPASS = function () {
  * Vector layer's visible entity collections rendering pass.
  * @protected
  */
-og.node.Planet.prototype._renderVectorLayersPASS = function () {
+og.scene.Planet.prototype._renderVectorLayersPASS = function () {
 
     var i = this.visibleVectorLayers.length;
     while (i--) {
@@ -984,7 +984,7 @@ og.node.Planet.prototype._renderVectorLayersPASS = function () {
  * Vector layers picking pass.
  * @protected
  */
-og.node.Planet.prototype._frustumEntityCollectionPickingCallback = function () {
+og.scene.Planet.prototype._frustumEntityCollectionPickingCallback = function () {
     this.drawPickingEntityCollections(this._frustumEntityCollections);
 };
 
@@ -992,7 +992,7 @@ og.node.Planet.prototype._frustumEntityCollectionPickingCallback = function () {
  * Starts clear memory thread.
  * @public
  */
-og.node.Planet.prototype.memClear = function () {
+og.scene.Planet.prototype.memClear = function () {
     this._quadTree.clearTree();
     this._quadTreeNorth.clearTree();
     this._quadTreeSouth.clearTree();
@@ -1006,7 +1006,7 @@ og.node.Planet.prototype.memClear = function () {
  * @param {og.math.VEctor3} direction - Ray direction.
  * @returns {og.math.Vector3}
  */
-og.node.Planet.prototype.hitRayEllipsoid = function (origin, direction) {
+og.scene.Planet.prototype.hitRayEllipsoid = function (origin, direction) {
     var mxTr = this.transformationMatrix.transposeTo();
     var sx = new og.math.Ray(mxTr.mulVec3(origin),
         mxTr.mulVec3(direction)).hitSphere(new og.bv.Sphere(this.ellipsoid._a));
@@ -1023,7 +1023,7 @@ og.node.Planet.prototype.hitRayEllipsoid = function (origin, direction) {
  * @param {og.math.Ray} ray - Ray 3d.
  * @returns {og.math.Vector3}
  */
-og.node.Planet.prototype.getRayIntersectionEllipsoid = function (ray) {
+og.scene.Planet.prototype.getRayIntersectionEllipsoid = function (ray) {
     return this.hitRayEllipsoid(ray.origin, ray.direction);
 };
 
@@ -1032,7 +1032,7 @@ og.node.Planet.prototype.getRayIntersectionEllipsoid = function (ray) {
  * @public
  * @param {og.math.Pixel} px - 2D sreen coordinates.
  */
-og.node.Planet.prototype.getCartesianFromPixelEllipsoid = function (px) {
+og.scene.Planet.prototype.getCartesianFromPixelEllipsoid = function (px) {
     var cam = this.renderer.activeCamera;
     return this.hitRayEllipsoid(cam.eye, cam.unproject(px.x, px.y));
 };
@@ -1043,7 +1043,7 @@ og.node.Planet.prototype.getCartesianFromPixelEllipsoid = function (px) {
  * @param {og.math.Pixel} px - 2D screen coordinates.
  * @returns {og.LonLat}
  */
-og.node.Planet.prototype.getLonLatFromPixelEllipsoid = function (px) {
+og.scene.Planet.prototype.getLonLatFromPixelEllipsoid = function (px) {
     var coords = this.getCartesianFromPixelEllipsoid(px);
     if (coords) {
         return this.ellipsoid.cartesianToLonLat(coords);
@@ -1057,7 +1057,7 @@ og.node.Planet.prototype.getLonLatFromPixelEllipsoid = function (px) {
  * @public
  * @returns {og.math.Vector3}
  */
-og.node.Planet.prototype.getCartesianFromMouseTerrain = function (force) {
+og.scene.Planet.prototype.getCartesianFromMouseTerrain = function (force) {
     var ms = this.renderer.events.mouseState;
     var distance = this.getDistanceFromPixel(ms, force);
     if (distance) {
@@ -1073,7 +1073,7 @@ og.node.Planet.prototype.getCartesianFromMouseTerrain = function (force) {
  * @param {og.math.Vector2} px - Pixel screen 2d coordinates.
  * @returns {og.math.Vector3}
  */
-og.node.Planet.prototype.getCartesianFromPixelTerrain = function (px, force) {
+og.scene.Planet.prototype.getCartesianFromPixelTerrain = function (px, force) {
     var distance = this.getDistanceFromPixel(px, force);
     if (distance) {
         var direction = this.renderer.activeCamera.unproject(px.x, px.y);
@@ -1089,7 +1089,7 @@ og.node.Planet.prototype.getCartesianFromPixelTerrain = function (px, force) {
  * @param {og.math.Vector2} px - Pixel screen 2d coordinates.
  * @returns {og.LonLat}
  */
-og.node.Planet.prototype.getLonLatFromPixelTerrain = function (px, force) {
+og.scene.Planet.prototype.getLonLatFromPixelTerrain = function (px, force) {
     var coords = this.getCartesianFromPixelTerrain(px, force);
     if (coords) {
         return this.ellipsoid.cartesianToLonLat(coords);
@@ -1103,7 +1103,7 @@ og.node.Planet.prototype.getLonLatFromPixelTerrain = function (px, force) {
  * @param {og.math.Vector3} coords - Cartesian coordinates.
  * @returns {og.math.Vector2}
  */
-og.node.Planet.prototype.getPixelFromCartesian = function (coords) {
+og.scene.Planet.prototype.getPixelFromCartesian = function (coords) {
     return this.renderer.activeCamera.project(coords);
 };
 
@@ -1113,7 +1113,7 @@ og.node.Planet.prototype.getPixelFromCartesian = function (coords) {
  * @param {og.LonLat} lonlat - Geographical coordinates.
  * @returns {og.math.Vector2}
  */
-og.node.Planet.prototype.getPixelFromLonLat = function (lonlat) {
+og.scene.Planet.prototype.getPixelFromLonLat = function (lonlat) {
     var coords = this.ellipsoid.lonLatToCartesian(lonlat);
     if (coords)
         return this.renderer.activeCamera.project(coords);
@@ -1127,7 +1127,7 @@ og.node.Planet.prototype.getPixelFromLonLat = function (lonlat) {
  * @param {og.math.Vector2} px
  * @returns {number}
  */
-og.node.Planet.prototype.getDistanceFromPixelEllipsoid = function (px) {
+og.scene.Planet.prototype.getDistanceFromPixelEllipsoid = function (px) {
     var coords = this.getCartesianFromPixelEllipsoid(px);
     return coords ? coords.distance(this.renderer.activeCamera.eye) : null;
 };
@@ -1141,7 +1141,7 @@ og.node.Planet.prototype.getDistanceFromPixelEllipsoid = function (px) {
  * @param {og.math.Vector2} px
  * @returns {number}
  */
-og.node.Planet.prototype.getDistanceFromPixel = function (px, force) {
+og.scene.Planet.prototype.getDistanceFromPixel = function (px, force) {
     if (this._viewChanged || force) {
         this._viewChanged = false;
         var color = og.math.Vector4.fromVec(this._heightBackbuffer.readPixel(px.x, this._heightBackbuffer.height - px.y));
@@ -1158,7 +1158,7 @@ og.node.Planet.prototype.getDistanceFromPixel = function (px, force) {
  * @public
  * @param {og.Extent} extent - Geographical extent.
  */
-og.node.Planet.prototype.viewExtent = function (extent) {
+og.scene.Planet.prototype.viewExtent = function (extent) {
     this.renderer.activeCamera.viewExtent(extent);
 };
 
@@ -1167,7 +1167,7 @@ og.node.Planet.prototype.viewExtent = function (extent) {
  * @public
  * @returns {og.Extent}
  */
-og.node.Planet.prototype.getViewExtent = function () {
+og.scene.Planet.prototype.getViewExtent = function () {
     if (this._viewExtentMerc) {
         var ne = this._viewExtentMerc.northEast.inverseMercator(),
             sw = this._viewExtentMerc.southWest.inverseMercator();
@@ -1198,7 +1198,7 @@ og.node.Planet.prototype.getViewExtent = function () {
  * @param {og.LonLat} lonlat - New geographical position.
  * @param {og.math.Vector3} [up] - Camera UP vector.
  */
-og.node.Planet.prototype.viewLonLat = function (lonlat, up) {
+og.scene.Planet.prototype.viewLonLat = function (lonlat, up) {
     this.renderer.activeCamera.setLonLat(lonlat, up);
 };
 
@@ -1208,7 +1208,7 @@ og.node.Planet.prototype.viewLonLat = function (lonlat, up) {
  * @param {og.Extent} extent - Geographical extent.
  * @param {og.math.Vector3} [up] - Camera UP vector on the end of a flying.
  */
-og.node.Planet.prototype.flyExtent = function (extent, up) {
+og.scene.Planet.prototype.flyExtent = function (extent, up) {
     this.renderer.activeCamera.flyExtent(extent, up);
 };
 
@@ -1219,7 +1219,7 @@ og.node.Planet.prototype.flyExtent = function (extent, up) {
  * @param {og.math.Vector3} [look] - Camera "look at" point.
  * @param {og.math.Vector3} [up] - Camera UP vector on the end of a flying.
  */
-og.node.Planet.prototype.flyCartesian = function (cartesian, look, up) {
+og.scene.Planet.prototype.flyCartesian = function (cartesian, look, up) {
     this.renderer.activeCamera.flyCartesian(cartesian, look, up);
 };
 
@@ -1230,7 +1230,7 @@ og.node.Planet.prototype.flyCartesian = function (cartesian, look, up) {
  * @param {og.math.Vector3} [look] - Camera "look at" point on the end of a flying.
  * @param {og.math.Vector3} [up] - Camera UP vector on the end of a flying.
  */
-og.node.Planet.prototype.flyLonLat = function (lonlat, look, up) {
+og.scene.Planet.prototype.flyLonLat = function (lonlat, look, up) {
     this.renderer.activeCamera.flyLonLat(lonlat, look, up);
 };
 
@@ -1238,11 +1238,11 @@ og.node.Planet.prototype.flyLonLat = function (lonlat, look, up) {
  * Breaks the flight.
  * @public
  */
-og.node.Planet.prototype.stopFlying = function () {
+og.scene.Planet.prototype.stopFlying = function () {
     this.renderer.activeCamera.stopFlying();
 };
 
-og.node.Planet.prototype.updateBillboardsTexCoords = function () {
+og.scene.Planet.prototype.updateBillboardsTexCoords = function () {
     for (var i = 0; i < this.entityCollections.length; i++) {
         this.entityCollections[i].billboardHandler.refreshTexCoordsArr();
     }
diff --git a/src/og/node/planetAtmosphere.js b/src/og/scene/planetAtmosphere.js
similarity index 93%
rename from src/og/node/planetAtmosphere.js
rename to src/og/scene/planetAtmosphere.js
index dc5d503f..1a0f9476 100644
--- a/src/og/node/planetAtmosphere.js
+++ b/src/og/scene/planetAtmosphere.js
@@ -1,4 +1,4 @@
-goog.provide('og.node.PlanetAtmosphere');
+goog.provide('og.scene.PlanetAtmosphere');
 
 goog.require('og.shape.Icosphere');
 goog.require('og.shaderProgram.atmosphereSpace');
@@ -8,7 +8,7 @@ goog.require('og.shaderProgram.single_nl');
 goog.require('og.shaderProgram.singleAtmosphere_wl');
 goog.require('og.inheritance');
 
-og.node.PlanetAtmosphere = function(name, ellipsoid){
+og.scene.PlanetAtmosphere = function(name, ellipsoid){
     og.inheritance.base(this, name, ellipsoid);
 
     this.atmosphereSpaceParams = {
@@ -86,9 +86,9 @@ og.node.PlanetAtmosphere = function(name, ellipsoid){
     this._atmosphereIndexBuffer = null;
 };
 
-og.inheritance.extend(og.node.PlanetAtmosphere, og.node.Planet);
+og.inheritance.extend(og.scene.PlanetAtmosphere, og.scene.Planet);
 
-og.node.PlanetAtmosphere.prototype._initializeShaders = function () {
+og.scene.PlanetAtmosphere.prototype._initializeShaders = function () {
     this.renderer.handler.addShaderProgram(og.shaderProgram.single_nl(), true);
     this.renderer.handler.addShaderProgram(og.shaderProgram.singleAtmosphere_wl(), true);
     this.renderer.handler.addShaderProgram(og.shaderProgram.overlays_nl(), true);
@@ -97,7 +97,7 @@ og.node.PlanetAtmosphere.prototype._initializeShaders = function () {
     this.renderer.handler.addShaderProgram(og.shaderProgram.atmosphereSpace(), true);
 };
 
-og.node.PlanetAtmosphere.prototype.initialization = function () {
+og.scene.PlanetAtmosphere.prototype.initialization = function () {
 
     this.constructor.superclass.initialization.call(this);
 
@@ -109,9 +109,9 @@ og.node.PlanetAtmosphere.prototype.initialization = function () {
 
 
 /**
- * @abstract
+ * @virtual
  */
-og.node.PlanetAtmosphere.prototype._rendering = function () {
+og.scene.PlanetAtmosphere.prototype._rendering = function () {
     this._renderNodesPASS();
     this._renderHeightBackbufferPASS();
     this._renderVectorLayersPASS();
@@ -119,9 +119,9 @@ og.node.PlanetAtmosphere.prototype._rendering = function () {
 };
 
 /**
- * @abstract
+ * @virtual
  */
-og.node.PlanetAtmosphere.prototype._drawOverlays = function () {
+og.scene.PlanetAtmosphere.prototype._drawOverlays = function () {
     var sh;
     var renderer = this.renderer;
     var h = renderer.handler;
@@ -203,9 +203,9 @@ og.node.PlanetAtmosphere.prototype._drawOverlays = function () {
 };
 
 /**
- * @abstract
+ * @virtual
  */
-og.node.PlanetAtmosphere.prototype._drawSingle = function () {
+og.scene.PlanetAtmosphere.prototype._drawSingle = function () {
     var sh;
     var renderer = this.renderer;
     var h = renderer.handler;
@@ -269,7 +269,7 @@ og.node.PlanetAtmosphere.prototype._drawSingle = function () {
     gl.disable(gl.BLEND);
 };
 
-og.node.PlanetAtmosphere.prototype._renderAtmosphere = function () {
+og.scene.PlanetAtmosphere.prototype._renderAtmosphere = function () {
     var rn = this;
     var r = rn.renderer;
 
diff --git a/src/og/node/renderNode.js b/src/og/scene/renderNode.js
similarity index 79%
rename from src/og/node/renderNode.js
rename to src/og/scene/renderNode.js
index cb7f2dce..26c78bb6 100644
--- a/src/og/node/renderNode.js
+++ b/src/og/scene/renderNode.js
@@ -1,8 +1,8 @@
-goog.provide('og.node.RenderNode');
+goog.provide('og.scene.RenderNode');
 
 goog.require('og.Events');
 goog.require('og.inheritance');
-goog.require('og.node.Node');
+goog.require('og.scene.Node');
 goog.require('og.webgl');
 goog.require('og.math.Matrix4');
 goog.require('og.math.Vector3');
@@ -11,15 +11,15 @@ goog.require('og.utils.FontAtlas');
 
 /**
  * Render node is a logical part of a render mechanism. Represents scene rendering.
- * Forexample one node for rendering the Earth, another one for rendering the Moon, another node for rendering stars etc.
+ * Forexample one scene node for rendering the Earth, another one for rendering the Moon, another node for rendering stars etc.
  * Each render node has own model view space defined with matrices(scale, rotation, translation, transformation).
  * There are collections of ligh sources, entities and so on in the node.
  * Access to the node is renderer.renderNodes["Earth"]
  * @class
- * @extends {og.node.Node}
+ * @extends {og.scene.Node}
  * @param {string} name - Node name.
  */
-og.node.RenderNode = function (name) {
+og.scene.RenderNode = function (name) {
 
     og.inheritance.base(this, name);
 
@@ -94,14 +94,14 @@ og.node.RenderNode = function (name) {
     this.events = new og.Events();
 };
 
-og.inheritance.extend(og.node.RenderNode, og.node.Node);
+og.inheritance.extend(og.scene.RenderNode, og.scene.Node);
 
 /**
  * Assign render node with renderer.
  * @public
  * @param {og.Renderer} renderer - Redner node's renderer.
  */
-og.node.RenderNode.prototype.assignRenderer = function (renderer) {
+og.scene.RenderNode.prototype.assignRenderer = function (renderer) {
     this.renderer = renderer;
     this.billboardsTextureAtlas.assignHandler(renderer.handler);
     this.fontAtlas.assignHandler(renderer.handler);
@@ -119,9 +119,9 @@ og.node.RenderNode.prototype.assignRenderer = function (renderer) {
  * @public
  * @param {og.EntityCollection} entityCollection - Entity collection.
  * @param {boolean} [isHidden] - If it's true that this collection has specific rendering.
- * @returns {og.node.RenderNode}
+ * @returns {og.scene.RenderNode}
  */
-og.node.RenderNode.prototype.addEntityCollection = function (entityCollection, isHidden) {
+og.scene.RenderNode.prototype.addEntityCollection = function (entityCollection, isHidden) {
     entityCollection.addTo(this, isHidden);
     return this;
 };
@@ -131,7 +131,7 @@ og.node.RenderNode.prototype.addEntityCollection = function (entityCollection, i
  * @public
  * @param {og.EntityCollection} entityCollection - Entity collection for remove.
  */
-og.node.RenderNode.prototype.removeEntityCollection = function (entityCollection) {
+og.scene.RenderNode.prototype.removeEntityCollection = function (entityCollection) {
     entityCollection.remove();
 };
 
@@ -139,9 +139,9 @@ og.node.RenderNode.prototype.removeEntityCollection = function (entityCollection
  * Adds point light source.
  * @public
  * @param {og.LightSource} light - Light source.
- * @returns {og.node.RenderNode}
+ * @returns {og.scene.RenderNode}
  */
-og.node.RenderNode.prototype.addLight = function (light) {
+og.scene.RenderNode.prototype.addLight = function (light) {
     light.addTo(this);
     return this;
 };
@@ -152,7 +152,7 @@ og.node.RenderNode.prototype.addLight = function (light) {
  * @param {string} name - Point light name.
  * @returns {og.LightSource}
  */
-og.node.RenderNode.prototype.getLightByName = function (name) {
+og.scene.RenderNode.prototype.getLightByName = function (name) {
     var li = this._lightsNames.indexOf(name);
     return this._lights[li];
 };
@@ -162,41 +162,41 @@ og.node.RenderNode.prototype.getLightByName = function (name) {
  * @public
  * @param {og.LightSource} light - Light source object.
  */
-og.node.RenderNode.prototype.removeLight = function (light) {
+og.scene.RenderNode.prototype.removeLight = function (light) {
     light.remove();
 };
 
 /**
- * Sets node scale matrix.
+ * Sets scene node scale matrix.
  * @public
  * @param {og.math.Vector3} xyz - Component scale vector.
- * @returns {og.node.RenderNode}
+ * @returns {og.scene.RenderNode}
  */
-og.node.RenderNode.prototype.setScale = function (xyz) {
+og.scene.RenderNode.prototype.setScale = function (xyz) {
     this.scaleMatrix.scale(xyz);
     return this;
 };
 
 /**
- * Sets node translation matrix.
+ * Sets scene node translation matrix.
  * @public
  * @param {og.math.Vector3} origin - New node's position.
- * @returns {og.node.RenderNode}
+ * @returns {og.scene.RenderNode}
  */
-og.node.RenderNode.prototype.setOrigin = function (origin) {
+og.scene.RenderNode.prototype.setOrigin = function (origin) {
     this.translationMatrix.translate(origin);
     return this;
 };
 
 /**
- * Sets node rotation matrix.
+ * Sets scene node rotation matrix.
  * @public
  * @param {number} ax - Euler axis X angle rotation.
  * @param {number} ay - Euler axis Y angle rotation.
  * @param {number} az - Euler axis Z angle rotation.
- * @returns {og.node.RenderNode}
+ * @returns {og.scene.RenderNode}
  */
-og.node.RenderNode.prototype.setAngles = function (ax, ay, az) {
+og.scene.RenderNode.prototype.setAngles = function (ax, ay, az) {
     this.rotationMatrix.eulerToMatrix(ax, ay, az);
     return this;
 };
@@ -205,7 +205,7 @@ og.node.RenderNode.prototype.setAngles = function (ax, ay, az) {
  * Updates render node's matrices
  * @public
  */
-og.node.RenderNode.prototype.updateMatrices = function () {
+og.scene.RenderNode.prototype.updateMatrices = function () {
     this.transformationMatrix = this.translationMatrix.mul(this.rotationMatrix).mul(this.scaleMatrix);
     this.itransformationMatrix = this.transformationMatrix.inverseTo();
 };
@@ -214,7 +214,7 @@ og.node.RenderNode.prototype.updateMatrices = function () {
  * Calls render frame node's callback. Used in renderer.
  * @public
  */
-og.node.RenderNode.prototype.drawNode = function () {
+og.scene.RenderNode.prototype.drawNode = function () {
     this._isActive && this._drawNodes();
 };
 
@@ -223,7 +223,7 @@ og.node.RenderNode.prototype.drawNode = function () {
  * @public
  * @returns {boolean}
  */
-og.node.RenderNode.prototype.isActive = function () {
+og.scene.RenderNode.prototype.isActive = function () {
     return this._isActive;
 };
 
@@ -232,7 +232,7 @@ og.node.RenderNode.prototype.isActive = function () {
  * @public
  * @param {boolean} isActive - Activation flag.
  */
-og.node.RenderNode.prototype.setActive = function (isActive) {
+og.scene.RenderNode.prototype.setActive = function (isActive) {
     this._isActive = isActive;
     for (var i = 0; i < this.childNodes.length; i++) {
         this.childNodes[i].setActive(isActive);
@@ -242,7 +242,7 @@ og.node.RenderNode.prototype.setActive = function (isActive) {
 /**
  * @public
  */
-og.node.RenderNode.prototype.setDrawMode = function (mode) {
+og.scene.RenderNode.prototype.setDrawMode = function (mode) {
     this.drawMode = mode;
     for (var i = 0; i < this.childNodes.length; i++) {
         this.childNodes[i].setDrawMode(mode);
@@ -253,7 +253,7 @@ og.node.RenderNode.prototype.setDrawMode = function (mode) {
  * This function have to be called manualy in each render node frame callback, before drawing scene geometry.
  * @public
  */
-og.node.RenderNode.prototype.transformLights = function () {
+og.scene.RenderNode.prototype.transformLights = function () {
     var r = this.renderer;
     for (var i = 0; i < this._lights.length; i++) {
         var ii = i * 4;
@@ -271,7 +271,7 @@ og.node.RenderNode.prototype.transformLights = function () {
     }
 };
 
-og.node.RenderNode.prototype.updateBillboardsTexCoords = function () {
+og.scene.RenderNode.prototype.updateBillboardsTexCoords = function () {
     for (var i = 0; i < this.entityCollections.length; i++) {
         this.entityCollections[i].billboardHandler.refreshTexCoordsArr();
     }
@@ -280,7 +280,7 @@ og.node.RenderNode.prototype.updateBillboardsTexCoords = function () {
 /**
  * @private
  */
-og.node.RenderNode.prototype._drawNodes = function () {
+og.scene.RenderNode.prototype._drawNodes = function () {
     for (var i = 0; i < this.childNodes.length; i++) {
         if (this.childNodes[i]._isActive)
             this.childNodes[i]._drawNodes();
@@ -298,7 +298,7 @@ og.node.RenderNode.prototype._drawNodes = function () {
 /**
  * @public
  */
-og.node.RenderNode.prototype.drawEntityCollections = function (ec) {
+og.scene.RenderNode.prototype.drawEntityCollections = function (ec) {
     if (ec.length) {
         var gl = this.renderer.handler.gl;
 
@@ -366,7 +366,7 @@ og.node.RenderNode.prototype.drawEntityCollections = function (ec) {
 /**
  * @public
  */
-og.node.RenderNode.prototype.drawPickingEntityCollections = function (ec) {
+og.scene.RenderNode.prototype.drawPickingEntityCollections = function (ec) {
     if (ec.length) {
 
         var gl = this.renderer.handler.gl;
@@ -410,6 +410,6 @@ og.node.RenderNode.prototype.drawPickingEntityCollections = function (ec) {
  * Picking entity frame callback
  * @private
  */
-og.node.RenderNode.prototype._entityCollectionPickingCallback = function () {
+og.scene.RenderNode.prototype._entityCollectionPickingCallback = function () {
     this.drawPickingEntityCollections(this.entityCollections);
 };
\ No newline at end of file
diff --git a/src/og/scene/scene.jsdoc b/src/og/scene/scene.jsdoc
new file mode 100644
index 00000000..c72a3e38
--- /dev/null
+++ b/src/og/scene/scene.jsdoc
@@ -0,0 +1,3 @@
+/**
+ * @namespace og.scene
+ */
\ No newline at end of file
diff --git a/src/og/node/skyBox.js b/src/og/scene/skyBox.js
similarity index 87%
rename from src/og/node/skyBox.js
rename to src/og/scene/skyBox.js
index 487b5928..35c7b246 100644
--- a/src/og/node/skyBox.js
+++ b/src/og/scene/skyBox.js
@@ -1,26 +1,26 @@
-goog.provide('og.node.SkyBox');
+goog.provide('og.scene.SkyBox');
 
 goog.require('og.inheritance');
-goog.require('og.node.RenderNode');
+goog.require('og.scene.RenderNode');
 goog.require('og.shaderProgram.skybox');
 
-og.node.SkyBox = function (params) {
+og.scene.SkyBox = function (params) {
     og.inheritance.base(this, "skybox");
     this.params = params;
     this.vertexPositionBuffer = null;
     this.texture = null;
 };
 
-og.inheritance.extend(og.node.SkyBox, og.node.RenderNode);
+og.inheritance.extend(og.scene.SkyBox, og.scene.RenderNode);
 
-og.node.SkyBox.prototype.initialization = function () {
+og.scene.SkyBox.prototype.initialization = function () {
     this.renderer.handler.addShaderProgram(og.shaderProgram.skybox(), true);
     this.texture = this.renderer.handler.loadCubeMapTexture(this.params);
     this.createBuffers();
     this.drawMode = this.renderer.handler.gl.TRIANGLES;
 };
 
-og.node.SkyBox.prototype.frame = function () {
+og.scene.SkyBox.prototype.frame = function () {
     var h = this.renderer.handler;
     var gl = h.gl;
     var cam = this.renderer.activeCamera;
@@ -42,7 +42,7 @@ og.node.SkyBox.prototype.frame = function () {
     h.gl.enable(h.gl.DEPTH_TEST);
 };
 
-og.node.SkyBox.prototype.createBuffers = function () {
+og.scene.SkyBox.prototype.createBuffers = function () {
 
     var vertices = new Float32Array([
         - 10000.0 ,   10000.0 , - 10000.0 ,
diff --git a/src/og/node/skySphere.js b/src/og/scene/skySphere.js
similarity index 86%
rename from src/og/node/skySphere.js
rename to src/og/scene/skySphere.js
index b34e0240..f102accd 100644
--- a/src/og/node/skySphere.js
+++ b/src/og/scene/skySphere.js
@@ -1,10 +1,10 @@
-goog.provide('og.node.SkySphere');
+goog.provide('og.scene.SkySphere');
 
 goog.require('og.inheritance');
-goog.require('og.node.RenderNode');
+goog.require('og.scene.RenderNode');
 goog.require('og.shaderProgram.skysphere');
 
-og.node.SkySphere = function (textureFilename, lonBands, latBands) {
+og.scene.SkySphere = function (textureFilename, lonBands, latBands) {
     og.inheritance.base(this, "skysphere");
 
     this._lonBands = lonBands || 8;
@@ -21,9 +21,9 @@ og.node.SkySphere = function (textureFilename, lonBands, latBands) {
     this._indexData = [];
 };
 
-og.inheritance.extend(og.node.SkySphere, og.node.RenderNode);
+og.inheritance.extend(og.scene.SkySphere, og.scene.RenderNode);
 
-og.node.SkySphere.prototype.initialization = function () {
+og.scene.SkySphere.prototype.initialization = function () {
     this.renderer.handler.addShaderProgram(og.shaderProgram.skysphere());
     this.drawMode = this.renderer.handler.gl.TRIANGLES;
     this._loadTexture();
@@ -31,14 +31,14 @@ og.node.SkySphere.prototype.initialization = function () {
     this._createBuffers();
 };
 
-og.node.SkySphere.prototype._createBuffers = function () {
+og.scene.SkySphere.prototype._createBuffers = function () {
     var h = this.renderer.handler;
     this._positionBuffer = h.createArrayBuffer(new Float32Array(this._positionData), 3, this._positionData.length / 3);
     this._indexBuffer = h.createElementArrayBuffer(new Uint16Array(this._indexData), 1, this._indexData.length);
     this._textureCoordBuffer = h.createArrayBuffer(new Float32Array(this._textureCoordData), 2, this._textureCoordData.length / 2);
 };
 
-og.node.SkySphere.prototype._loadTexture = function () {
+og.scene.SkySphere.prototype._loadTexture = function () {
     var that = this;
     var img = new Image();
     img.onload = function () {
@@ -47,7 +47,7 @@ og.node.SkySphere.prototype._loadTexture = function () {
     img.src = this._textureFilename;
 };
 
-og.node.SkySphere.prototype._createCoordinates = function () {
+og.scene.SkySphere.prototype._createCoordinates = function () {
 
     for (var latNumber = 0; latNumber <= this._latBands; latNumber++) {
         var theta = latNumber * Math.PI / this._latBands;
@@ -87,7 +87,7 @@ og.node.SkySphere.prototype._createCoordinates = function () {
     }
 };
 
-og.node.SkySphere.prototype.frame = function () {
+og.scene.SkySphere.prototype.frame = function () {
 
     var r = this.renderer;
 
diff --git a/src/og/shapes/baseShape.js b/src/og/shapes/baseShape.js
index cdb9edbb..7bd1dd40 100644
--- a/src/og/shapes/baseShape.js
+++ b/src/og/shapes/baseShape.js
@@ -151,7 +151,7 @@ og.shape.BaseShape = function (options) {
     /**
      * Assigned render node.
      * @protected
-     * @type {og.node.RenderNode}
+     * @type {og.scene.RenderNode}
      */
     this._renderNode = null;
 
@@ -281,7 +281,7 @@ og.shape.BaseShape.prototype.getVisibility = function () {
 /**
  * Assign render node.
  * @public
- * @param {og.node.RenderNode} renderNode - Render node to assign.
+ * @param {og.scene.RenderNode} renderNode - Render node to assign.
  */
 og.shape.BaseShape.prototype.setRenderNode = function (renderNode) {
     this._renderNode = renderNode;
diff --git a/src/og/webgl/handler.js b/src/og/webgl/handler.js
index 753bc4bb..ca0e1ac1 100644
--- a/src/og/webgl/handler.js
+++ b/src/og/webgl/handler.js
@@ -124,7 +124,9 @@ og.webgl.Handler = function (id, params) {
 };
 
 /**
+ * Maximum texture image size.
  * @const
+ * @type {number}
  */
 og.webgl.Handler.MAX_SIZE = 4096;