diff --git a/packages.txt b/packages.txt
index ad46b69..5f1d133 100644
--- a/packages.txt
+++ b/packages.txt
@@ -1,5 +1,6 @@
 package_1 alternativa.osgi.service.console.variables
 package_2 alternativa.tanks.game.entities.map
+package_3 alternativa.tanks.game.entities.tank.graphics.materials
 package_5 alternativa.osgi
 package_6 alternativa.osgi.service.console
 package_7 alternativa.tanks
diff --git a/src/TanksTestingTool.as b/src/TanksTestingTool.as
index 1e97e45..179c9d1 100644
--- a/src/TanksTestingTool.as
+++ b/src/TanksTestingTool.as
@@ -26,11 +26,11 @@ package
    import package_18.name_44;
    import alternativa.tanks.game.entities.map.VisibleLightMaterial;
    import alternativa.tanks.game.entities.map.MapMaterial;
-   import package_3.TankMaterial2;
-   import package_3.name_10;
-   import package_3.name_29;
-   import package_3.name_33;
-   import package_3.name_7;
+   import alternativa.tanks.game.entities.tank.graphics.materials.TankMaterial2;
+   import alternativa.tanks.game.entities.tank.graphics.materials.TreesMaterial;
+   import alternativa.tanks.game.entities.tank.graphics.materials.GiShadowMaterial;
+   import alternativa.tanks.game.entities.tank.graphics.materials.TracksMaterial2;
+   import alternativa.tanks.game.entities.tank.graphics.materials.TankMaterial;
    import package_4.name_11;
    import package_4.name_28;
    import package_4.name_6;
@@ -110,11 +110,11 @@ package
          new ConsoleVarFloat("beam_fallof",170,0,180,this.onLightSettingsChange);
          new ConsoleVarFloat("camera_smoothing",20,0,200,this.onControllerSettingsChange);
          MapMaterial.fogMode = MapMaterial.DISABLED;
-         name_10.fogMode = name_10.DISABLED;
-         name_7.fogMode = name_7.DISABLED;
-         TankMaterial2.fogMode = name_7.DISABLED;
-         name_29.fogMode = name_11.DISABLED;
-         name_33.fogMode = name_11.DISABLED;
+         TreesMaterial.fogMode = TreesMaterial.DISABLED;
+         TankMaterial.fogMode = TankMaterial.DISABLED;
+         TankMaterial2.fogMode = TankMaterial.DISABLED;
+         GiShadowMaterial.fogMode = name_11.DISABLED;
+         TracksMaterial2.fogMode = name_11.DISABLED;
       }
       
       private function onControllerSettingsChange(param1:ConsoleVarFloat) : void
diff --git a/src/alternativa/tanks/TankTestTask.as b/src/alternativa/tanks/TankTestTask.as
index 25f3876..d67182d 100644
--- a/src/alternativa/tanks/TankTestTask.as
+++ b/src/alternativa/tanks/TankTestTask.as
@@ -30,9 +30,9 @@ package alternativa.tanks
    import package_28.name_259;
    import package_28.name_93;
    import package_29.MouseEvent3D;
-   import package_3.TankMaterial2;
-   import package_3.name_29;
-   import package_3.name_33;
+   import alternativa.tanks.game.entities.tank.graphics.materials.TankMaterial2;
+   import alternativa.tanks.game.entities.tank.graphics.materials.GiShadowMaterial;
+   import alternativa.tanks.game.entities.tank.graphics.materials.TracksMaterial2;
    import package_39.name_160;
    import package_4.class_4;
    import package_4.class_5;
@@ -702,12 +702,12 @@ package alternativa.tanks
          }
       }
       
-      private function createTracksMaterial(param1:name_249) : name_33
+      private function createTracksMaterial(param1:name_249) : TracksMaterial2
       {
          var _loc2_:name_55 = param1.textureData;
          var _loc3_:name_241 = this.var_65.name_254(_loc2_.name_248(name_243.KEY_TRACKS_DIFFUSE));
          var _loc4_:name_241 = this.var_65.name_254(_loc2_.name_248(name_243.KEY_TRACKS_NORMAL));
-         var _loc5_:name_33 = new name_33();
+         var _loc5_:TracksMaterial2 = new TracksMaterial2();
          _loc5_.glossiness = 65;
          _loc5_.var_25 = 0.6;
          _loc5_.diffuseMap = _loc3_;
@@ -719,14 +719,14 @@ package alternativa.tanks
          return _loc5_;
       }
       
-      private function createShadowMaterial(param1:name_249) : name_29
+      private function createShadowMaterial(param1:name_249) : GiShadowMaterial
       {
          var _loc3_:name_241 = null;
          var _loc2_:name_55 = param1.textureData;
          if(_loc2_.name_248(name_243.KEY_SHADOW) != null)
          {
             _loc3_ = this.var_65.name_254(_loc2_.name_248(name_243.KEY_SHADOW));
-            return new name_29(_loc3_);
+            return new GiShadowMaterial(_loc3_);
          }
          return null;
       }
diff --git a/src/alternativa/tanks/game/entities/map/A3DMapBuilder.as b/src/alternativa/tanks/game/entities/map/A3DMapBuilder.as
index c3d58a6..9f00cbb 100644
--- a/src/alternativa/tanks/game/entities/map/A3DMapBuilder.as
+++ b/src/alternativa/tanks/game/entities/map/A3DMapBuilder.as
@@ -21,7 +21,7 @@ package alternativa.tanks.game.entities.map
    import package_28.name_241;
    import package_28.name_259;
    import package_28.name_93;
-   import package_3.name_10;
+   import alternativa.tanks.game.entities.tank.graphics.materials.TreesMaterial;
    import package_4.name_643;
    import package_76.name_235;
    import package_86.name_257;
@@ -265,7 +265,7 @@ package alternativa.tanks.game.entities.map
          var diffuse:name_129 = null;
          var bump:name_129 = null;
          var opacity:name_129 = null;
-         var trMaterial:name_10 = null;
+         var trMaterial:TreesMaterial = null;
          if(data != null)
          {
             parser = new name_529();
@@ -285,7 +285,7 @@ package alternativa.tanks.game.entities.map
                         diffuse = this.getCompressedTextureResource(material.textures["diffuse"],resourceCache,this.mapFiles);
                         bump = this.getCompressedTextureResource(material.textures["bump"],resourceCache,this.mapFiles);
                         opacity = this.getCompressedTextureResource(material.textures["transparent"],resourceCache,this.mapFiles);
-                        trMaterial = new name_10(diffuse,fakeBumpTextureResource,null,null,opacity);
+                        trMaterial = new TreesMaterial(diffuse,fakeBumpTextureResource,null,null,opacity);
                         trMaterial.var_25 = 0;
                         trMaterial.alphaThreshold = 0.2;
                         surface.material = trMaterial;
diff --git a/src/package_3/name_29.as b/src/alternativa/tanks/game/entities/tank/graphics/materials/GiShadowMaterial.as
similarity index 94%
rename from src/package_3/name_29.as
rename to src/alternativa/tanks/game/entities/tank/graphics/materials/GiShadowMaterial.as
index 0e0e363..33ce78d 100644
--- a/src/package_3/name_29.as
+++ b/src/alternativa/tanks/game/entities/tank/graphics/materials/GiShadowMaterial.as
@@ -1,4 +1,4 @@
-package package_3
+package alternativa.tanks.game.entities.tank.graphics.materials
 {
    import alternativa.engine3d.alternativa3d;
    import flash.display.BitmapData;
@@ -29,7 +29,7 @@ package package_3
    
    use namespace alternativa3d;
    
-   public class name_29 extends class_4
+   public class GiShadowMaterial extends class_4
    {
       public static var fogTexture:name_129;
       
@@ -63,7 +63,7 @@ package package_3
       
       public var texture:name_129;
       
-      public function name_29(texture:name_129)
+      public function GiShadowMaterial(texture:name_129)
       {
          super();
          this.texture = texture;
@@ -83,7 +83,7 @@ package package_3
          }
       }
       
-      private function method_75(object:name_78) : name_127
+      private function setupProgram(object:name_78) : name_127
       {
          var vertexLinker:name_121 = new name_121(Context3DProgramType.VERTEX);
          var positionVar:String = "aPosition";
@@ -152,7 +152,7 @@ package package_3
          if(programs == null)
          {
             programs = new Vector.<name_127>(3,true);
-            program = this.method_75(object);
+            program = this.setupProgram(object);
             program.upload(camera.alternativa3d::context3D);
             programs[fogMode] = program;
             _programs[object.alternativa3d::transformProcedure] = programs;
@@ -162,7 +162,7 @@ package package_3
             program = programs[fogMode];
             if(program == null)
             {
-               program = this.method_75(object);
+               program = this.setupProgram(object);
                program.upload(camera.alternativa3d::context3D);
                programs[fogMode] = program;
             }
@@ -235,7 +235,7 @@ package package_3
       
       override public function clone() : class_4
       {
-         return new name_29(this.texture);
+         return new GiShadowMaterial(this.texture);
       }
    }
 }
diff --git a/src/package_3/name_7.as b/src/alternativa/tanks/game/entities/tank/graphics/materials/TankMaterial.as
similarity index 95%
rename from src/package_3/name_7.as
rename to src/alternativa/tanks/game/entities/tank/graphics/materials/TankMaterial.as
index 6704f25..331843f 100644
--- a/src/package_3/name_7.as
+++ b/src/alternativa/tanks/game/entities/tank/graphics/materials/TankMaterial.as
@@ -1,4 +1,4 @@
-package package_3
+package alternativa.tanks.game.entities.tank.graphics.materials
 {
    import alternativa.engine3d.alternativa3d;
    import flash.display.BitmapData;
@@ -31,7 +31,7 @@ package package_3
    
    use namespace alternativa3d;
    
-   public class name_7 extends class_5
+   public class TankMaterial extends class_5
    {
       private static var fogTexture:name_129;
       
@@ -109,7 +109,7 @@ package package_3
       
       alternativa3d var var_23:Boolean = false;
       
-      public function name_7(colorMap:name_129 = null, diffuseMap:name_129 = null, normalMap:name_129 = null, surfaceMap:name_129 = null)
+      public function TankMaterial(colorMap:name_129 = null, diffuseMap:name_129 = null, normalMap:name_129 = null, surfaceMap:name_129 = null)
       {
          super(diffuseMap);
          this.colorMap = colorMap;
@@ -131,7 +131,7 @@ package package_3
       {
       }
       
-      private function method_75(targetObject:name_78, lights:Vector.<name_116>, directional:DirectionalLight, lightsLength:int) : name_127
+      private function setupProgram(targetObject:name_78, lights:Vector.<name_116>, directional:DirectionalLight, lightsLength:int) : name_127
       {
          var i:int = 0;
          var procedure:name_114 = null;
@@ -216,7 +216,7 @@ package package_3
                if(dirMulShadowProcedure == null)
                {
                   dirMulShadowProcedure = new name_114(null,"DirectionalLightWithShadow");
-                  this.method_76(dirMulShadowProcedure,directional,true);
+                  this.formDirectionalProcedure(dirMulShadowProcedure,directional,true);
                }
                fragmentLinker.name_123(dirMulShadowProcedure);
                fragmentLinker.name_118(dirMulShadowProcedure,"tNormal","tViewVector","tTotalLight","cAmbientColor");
@@ -233,7 +233,7 @@ package package_3
                      lightFragmentProcedure = new name_114();
                      if(light is DirectionalLight)
                      {
-                        this.method_76(lightFragmentProcedure,light,false);
+                        this.formDirectionalProcedure(lightFragmentProcedure,light,false);
                         lightFragmentProcedure.name = i + "DirectionalLight";
                      }
                      else if(light is OmniLight)
@@ -298,7 +298,7 @@ package package_3
          return new name_127(vertexLinker,fragmentLinker);
       }
       
-      private function method_76(procedure:name_114, light:name_116, useShadow:Boolean) : void
+      private function formDirectionalProcedure(procedure:name_114, light:name_116, useShadow:Boolean) : void
       {
          var source:Array = ["#c0=c" + light.alternativa3d::name_138 + "Direction","#c1=c" + light.alternativa3d::name_138 + "Color","add t0.xyz, i1.xyz, c0.xyz","mov t0.w, c0.w","nrm t0.xyz,t0.xyz","dp3 t0.w, t0.xyz, i0.xyz","pow t0.w, t0.w, o1.w","dp3 t0.x, i0, c0.xyz","sat t0.x, t0.x"];
          if(useShadow)
@@ -408,7 +408,7 @@ package package_3
          {
             dict = new Dictionary();
             _programs[object.alternativa3d::transformProcedure] = dict;
-            program = this.method_75(object,lights,directional,lightsLength);
+            program = this.setupProgram(object,lights,directional,lightsLength);
             program.upload(camera.alternativa3d::context3D);
             dict[key] = program;
          }
@@ -417,7 +417,7 @@ package package_3
             program = dict[key];
             if(program == null)
             {
-               program = this.method_75(object,lights,directional,lightsLength);
+               program = this.setupProgram(object,lights,directional,lightsLength);
                program.upload(camera.alternativa3d::context3D);
                dict[key] = program;
             }
diff --git a/src/package_3/TankMaterial2.as b/src/alternativa/tanks/game/entities/tank/graphics/materials/TankMaterial2.as
similarity index 97%
rename from src/package_3/TankMaterial2.as
rename to src/alternativa/tanks/game/entities/tank/graphics/materials/TankMaterial2.as
index 5e26aec..f801199 100644
--- a/src/package_3/TankMaterial2.as
+++ b/src/alternativa/tanks/game/entities/tank/graphics/materials/TankMaterial2.as
@@ -1,4 +1,4 @@
-package package_3
+package alternativa.tanks.game.entities.tank.graphics.materials
 {
    import alternativa.engine3d.alternativa3d;
    import flash.display.BitmapData;
diff --git a/src/package_3/name_33.as b/src/alternativa/tanks/game/entities/tank/graphics/materials/TracksMaterial2.as
similarity index 91%
rename from src/package_3/name_33.as
rename to src/alternativa/tanks/game/entities/tank/graphics/materials/TracksMaterial2.as
index 8fc4036..13079fb 100644
--- a/src/package_3/name_33.as
+++ b/src/alternativa/tanks/game/entities/tank/graphics/materials/TracksMaterial2.as
@@ -1,4 +1,4 @@
-package package_3
+package alternativa.tanks.game.entities.tank.graphics.materials
 {
    import alternativa.engine3d.alternativa3d;
    import flash.display.BitmapData;
@@ -33,7 +33,7 @@ package package_3
    
    use namespace alternativa3d;
    
-   public class name_33 extends class_5
+   public class TracksMaterial2 extends class_5
    {
       private static var fogTexture:name_129;
       
@@ -83,9 +83,9 @@ package package_3
       
       private static const passVaryingsProcedure:name_114 = new name_114(["#c0=cCamera","#v0=vPosition","#v1=vViewVector","mov v0, i0","sub t0, c0, i0","mov v1.xyz, t0.xyz","mov v1.w, c0.w"],"passVaryingsProcedure");
       
-      private static const passTBNRightProcedure:name_114 = method_123(true);
+      private static const passTBNRightProcedure:name_114 = getPassTBNProcedure(true);
       
-      private static const passTBNLeftProcedure:name_114 = method_123(false);
+      private static const passTBNLeftProcedure:name_114 = getPassTBNProcedure(false);
       
       private static const getNormalAndViewProcedure:name_114 = new name_114(["#v0=vTangent","#v1=vBinormal","#v2=vNormal","#v3=vUV","#v4=vViewVector","#c0=cSurface","#s0=sBump","tex t0, v3, s0 <2d,repeat,linear,miplinear>","add t0, t0, t0","sub t0.xyz, t0.xyz, c0.www","nrm t1.xyz, v0.xyz","dp3 o0.x, t0.xyz, t1.xyz","nrm t1.xyz, v1.xyz","dp3 o0.y, t0.xyz, t1.xyz","nrm t1.xyz, v2.xyz","dp3 o0.z, t0.xyz, t1.xyz","nrm o0.xyz, o0.xyz","nrm o1.xyz, v4"],"getNormalAndViewProcedure");
       
@@ -103,7 +103,7 @@ package package_3
       
       private const outputWithSpecularProcedure:name_114 = new name_114(["mul t0.xyz, i0.xyz, i1.xyz","add t0.xyz, t0.xyz, i2.xyz","mov t0.w, i1.w","mov o0, t0"],"outputWithSpecularProcedure");
       
-      public function name_33(diffuse:name_129 = null, normalMap:name_129 = null)
+      public function TracksMaterial2(diffuse:name_129 = null, normalMap:name_129 = null)
       {
          super();
          this.diffuseMap = diffuse;
@@ -115,7 +115,7 @@ package package_3
          fogTexture = texture;
       }
       
-      private static function method_123(right:Boolean) : name_114
+      private static function getPassTBNProcedure(right:Boolean) : name_114
       {
          var crsInSpace:String = right ? "crs t1.xyz, i0, i1" : "crs t1.xyz, i1, i0";
          return new name_114(["#v0=vTangent","#v1=vBinormal","#v2=vNormal",crsInSpace,"mul t1.xyz, t1.xyz, i0.w","mov v0.x, i0.x","mov v0.y, t1.x","mov v0.z, i1.x","mov v0.w, i1.w","mov v1.x, i0.y","mov v1.y, t1.y","mov v1.z, i1.y","mov v1.w, i1.w","mov v2.x, i0.z","mov v2.y, t1.z","mov v2.z, i1.z","mov v2.w, i1.w"],"passTBNProcedure");
@@ -195,22 +195,22 @@ package package_3
             program = programs[0];
             if(program == null)
             {
-               program = this.method_125(object,shadowedLight.shadow,true);
+               program = this.setupShadowOrAmbient(object,shadowedLight.shadow,true);
                program.upload(camera.alternativa3d::context3D);
                programs[0] = program;
             }
-            drawUnit = this.method_126(program,shadowedLight.shadow,true,camera,object,surface,geometry);
+            drawUnit = this.getShadowOrAmbientDrawUnit(program,shadowedLight.shadow,true,camera,object,surface,geometry);
          }
          else
          {
             program = programs[1];
             if(program == null)
             {
-               program = this.method_125(object,null,true);
+               program = this.setupShadowOrAmbient(object,null,true);
                program.upload(camera.alternativa3d::context3D);
                programs[1] = program;
             }
-            drawUnit = this.method_126(program,null,true,camera,object,surface,geometry);
+            drawUnit = this.getShadowOrAmbientDrawUnit(program,null,true,camera,object,surface,geometry);
          }
          drawUnit.alternativa3d::blendSource = Context3DBlendFactor.ONE;
          drawUnit.alternativa3d::blendDestination = Context3DBlendFactor.ZERO;
@@ -226,11 +226,11 @@ package package_3
                   program = programs[2];
                   if(program == null)
                   {
-                     program = this.method_125(object,shadow,false);
+                     program = this.setupShadowOrAmbient(object,shadow,false);
                      program.upload(camera.alternativa3d::context3D);
                      programs[2] = program;
                   }
-                  drawUnit = this.method_126(program,shadow,false,camera,object,surface,geometry);
+                  drawUnit = this.getShadowOrAmbientDrawUnit(program,shadow,false,camera,object,surface,geometry);
                   drawUnit.alternativa3d::blendSource = Context3DBlendFactor.ZERO;
                   drawUnit.alternativa3d::blendDestination = Context3DBlendFactor.SOURCE_COLOR;
                   camera.alternativa3d::renderer.alternativa3d::name_130(drawUnit,name_128.SHADOWS);
@@ -241,11 +241,11 @@ package package_3
             if(program == null)
             {
                lightContainer[0] = shadowedLight;
-               program = this.method_127(object,lightContainer,1);
+               program = this.setupLighting(object,lightContainer,1);
                program.upload(camera.alternativa3d::context3D);
                programs[3] = program;
             }
-            drawUnit = this.method_128(program,lightContainer,1,camera,object,surface,geometry);
+            drawUnit = this.getLightingDrawUnit(program,lightContainer,1,camera,object,surface,geometry);
             drawUnit.alternativa3d::blendSource = Context3DBlendFactor.DESTINATION_ALPHA;
             drawUnit.alternativa3d::blendDestination = Context3DBlendFactor.ONE;
             camera.alternativa3d::renderer.alternativa3d::name_130(drawUnit,name_128.SHADOWED_LIGHTS);
@@ -261,11 +261,11 @@ package package_3
             program = lightsPrograms[lightsKey];
             if(program == null)
             {
-               program = this.method_127(object,actualLigths,actualLightsLength);
+               program = this.setupLighting(object,actualLigths,actualLightsLength);
                program.upload(camera.alternativa3d::context3D);
                lightsPrograms[lightsKey] = program;
             }
-            drawUnit = this.method_128(program,actualLigths,actualLightsLength,camera,object,surface,geometry);
+            drawUnit = this.getLightingDrawUnit(program,actualLigths,actualLightsLength,camera,object,surface,geometry);
             drawUnit.alternativa3d::blendSource = Context3DBlendFactor.ONE;
             drawUnit.alternativa3d::blendDestination = Context3DBlendFactor.ONE;
             camera.alternativa3d::renderer.alternativa3d::name_130(drawUnit,name_128.LIGHTS);
@@ -275,11 +275,11 @@ package package_3
             program = programs[int(fogMode + 4)];
             if(program == null)
             {
-               program = this.method_129(object);
+               program = this.setupFog(object);
                program.upload(camera.alternativa3d::context3D);
                programs[int(fogMode + 4)] = program;
             }
-            drawUnit = this.method_130(program,camera,object,surface,geometry);
+            drawUnit = this.getFogDrawUnit(program,camera,object,surface,geometry);
             drawUnit.alternativa3d::blendSource = Context3DBlendFactor.ONE;
             drawUnit.alternativa3d::blendDestination = Context3DBlendFactor.SOURCE_ALPHA;
             camera.alternativa3d::renderer.alternativa3d::name_130(drawUnit,name_128.FOG);
@@ -287,7 +287,7 @@ package package_3
          actualLigths.length = 0;
       }
       
-      private function method_125(object:name_78, shadow:name_103, ambient:Boolean) : name_127
+      private function setupShadowOrAmbient(object:name_78, shadow:name_103, ambient:Boolean) : name_127
       {
          var shadowProc:name_114 = null;
          var vertexLinker:name_121 = new name_121(Context3DProgramType.VERTEX);
@@ -334,7 +334,7 @@ package package_3
          return new name_127(vertexLinker,fragmentLinker);
       }
       
-      private function method_126(program:name_127, shadow:name_103, ambient:Boolean, camera:name_124, object:name_78, surface:name_117, geometry:name_119) : name_135
+      private function getShadowOrAmbientDrawUnit(program:name_127, shadow:name_103, ambient:Boolean, camera:name_124, object:name_78, surface:name_117, geometry:name_119) : name_135
       {
          var positionBuffer:VertexBuffer3D = geometry.alternativa3d::getVertexBuffer(name_126.POSITION);
          var uvBuffer:VertexBuffer3D = geometry.alternativa3d::getVertexBuffer(name_126.TEXCOORDS[0]);
@@ -363,7 +363,7 @@ package package_3
          return drawUnit;
       }
       
-      private function method_127(object:name_78, lights:Vector.<name_116>, lightsLength:int) : name_127
+      private function setupLighting(object:name_78, lights:Vector.<name_116>, lightsLength:int) : name_127
       {
          var procedure:name_114 = null;
          var light:name_116 = null;
@@ -429,7 +429,7 @@ package package_3
          return new name_127(vertexLinker,fragmentLinker);
       }
       
-      private function method_128(program:name_127, lights:Vector.<name_116>, lightsLength:int, camera:name_124, object:name_78, surface:name_117, geometry:name_119) : name_135
+      private function getLightingDrawUnit(program:name_127, lights:Vector.<name_116>, lightsLength:int, camera:name_124, object:name_78, surface:name_117, geometry:name_119) : name_135
       {
          var rScale:Number = NaN;
          var transform:name_139 = null;
@@ -479,7 +479,7 @@ package package_3
          return drawUnit;
       }
       
-      private function method_129(object:name_78) : name_127
+      private function setupFog(object:name_78) : name_127
       {
          var vertexLinker:name_121 = new name_121(Context3DProgramType.VERTEX);
          var fragmentLinker:name_121 = new name_121(Context3DProgramType.FRAGMENT);
@@ -509,7 +509,7 @@ package package_3
          return new name_127(vertexLinker,fragmentLinker);
       }
       
-      private function method_130(program:name_127, camera:name_124, object:name_78, surface:name_117, geometry:name_119) : name_135
+      private function getFogDrawUnit(program:name_127, camera:name_124, object:name_78, surface:name_117, geometry:name_119) : name_135
       {
          var lm:name_139 = null;
          var dist:Number = NaN;
@@ -583,7 +583,7 @@ package package_3
       
       override public function clone() : class_4
       {
-         var cloned:name_33 = new name_33(diffuseMap,this.normalMap);
+         var cloned:TracksMaterial2 = new TracksMaterial2(diffuseMap,this.normalMap);
          cloned.var_25 = this.var_25;
          cloned.glossiness = this.glossiness;
          return cloned;
diff --git a/src/package_3/name_10.as b/src/alternativa/tanks/game/entities/tank/graphics/materials/TreesMaterial.as
similarity index 89%
rename from src/package_3/name_10.as
rename to src/alternativa/tanks/game/entities/tank/graphics/materials/TreesMaterial.as
index a8f578f..f23115e 100644
--- a/src/package_3/name_10.as
+++ b/src/alternativa/tanks/game/entities/tank/graphics/materials/TreesMaterial.as
@@ -1,4 +1,4 @@
-package package_3
+package alternativa.tanks.game.entities.tank.graphics.materials
 {
    import alternativa.engine3d.alternativa3d;
    import package_19.name_117;
@@ -15,7 +15,7 @@ package package_3
    
    use namespace alternativa3d;
    
-   public class name_10 extends class_9
+   public class TreesMaterial extends class_9
    {
       public static const DISABLED:int = 0;
       
@@ -31,7 +31,7 @@ package package_3
       
       public var vOffset:Number = 0;
       
-      public function name_10(diffuseMap:name_129 = null, normalMap:name_129 = null, specularMap:name_129 = null, glossinessMap:name_129 = null, opacityMap:name_129 = null, alphaThreshold:Number = 1)
+      public function TreesMaterial(diffuseMap:name_129 = null, normalMap:name_129 = null, specularMap:name_129 = null, glossinessMap:name_129 = null, opacityMap:name_129 = null, alphaThreshold:Number = 1)
       {
          super(diffuseMap,normalMap,specularMap,glossinessMap,opacityMap);
          alternativa3d::outputAlpha = new name_114(["#c0=cSurface","sub t0.w, i0.w, c0.w","kil t0.w","mov o0, i0"],"outputAlpha");
@@ -135,7 +135,7 @@ package package_3
       
       override public function clone() : class_4
       {
-         var cloned:name_10 = new name_10(diffuseMap,normalMap,specularMap,glossinessMap);
+         var cloned:TreesMaterial = new TreesMaterial(diffuseMap,normalMap,specularMap,glossinessMap);
          cloned.opacityMap = opacityMap;
          cloned.alpha = alpha;
          cloned.var_21 = var_21;
diff --git a/src/package_18/name_44.as b/src/package_18/name_44.as
index 948ccf8..2d405ad 100644
--- a/src/package_18/name_44.as
+++ b/src/package_18/name_44.as
@@ -29,11 +29,11 @@ package package_18
    import package_27.name_95;
    import package_28.name_93;
    import package_29.MouseEvent3D;
-   import package_3.TankMaterial2;
-   import package_3.name_10;
-   import package_3.name_29;
-   import package_3.name_33;
-   import package_3.name_7;
+   import alternativa.tanks.game.entities.tank.graphics.materials.TankMaterial2;
+   import alternativa.tanks.game.entities.tank.graphics.materials.TreesMaterial;
+   import alternativa.tanks.game.entities.tank.graphics.materials.GiShadowMaterial;
+   import alternativa.tanks.game.entities.tank.graphics.materials.TracksMaterial2;
+   import alternativa.tanks.game.entities.tank.graphics.materials.TankMaterial;
    import package_9.name_23;
    
    use namespace alternativa3d;
@@ -176,12 +176,12 @@ package package_18
       public function name_41(mode:int) : void
       {
          MapMaterial.fogMode = mode;
-         name_7.fogMode = mode;
+         TankMaterial.fogMode = mode;
          TankMaterial2.fogMode = mode;
-         name_33.fogMode = mode;
-         name_10.fogMode = mode;
+         TracksMaterial2.fogMode = mode;
+         TreesMaterial.fogMode = mode;
          name_79.fogMode = mode;
-         name_29.fogMode = mode;
+         GiShadowMaterial.fogMode = mode;
          if(mode == 1)
          {
             this.var_5.fogFar = MapMaterial.fogFar;
@@ -195,34 +195,34 @@ package package_18
       public function name_47(value:Number) : void
       {
          MapMaterial.fogNear = value;
-         name_7.fogNear = value;
+         TankMaterial.fogNear = value;
          TankMaterial2.fogNear = value;
-         name_33.fogNear = value;
-         name_10.fogNear = value;
-         name_29.fogNear = value;
+         TracksMaterial2.fogNear = value;
+         TreesMaterial.fogNear = value;
+         GiShadowMaterial.fogNear = value;
          this.var_5.fogNear = value;
       }
       
       public function name_48(value:Number) : void
       {
          MapMaterial.fogFar = value;
-         name_7.fogFar = value;
+         TankMaterial.fogFar = value;
          TankMaterial2.fogFar = value;
-         name_33.fogFar = value;
-         name_10.fogFar = value;
-         name_29.fogFar = value;
+         TracksMaterial2.fogFar = value;
+         TreesMaterial.fogFar = value;
+         GiShadowMaterial.fogFar = value;
          this.var_5.fogFar = value;
       }
       
       public function name_49(value:Number) : void
       {
          MapMaterial.fogMaxDensity = value;
-         name_7.fogMaxDensity = value;
+         TankMaterial.fogMaxDensity = value;
          TankMaterial2.fogMaxDensity = value;
-         name_33.fogMaxDensity = value;
-         name_10.fogMaxDensity = value;
+         TracksMaterial2.fogMaxDensity = value;
+         TreesMaterial.fogMaxDensity = value;
          name_79.fogMaxDensity = value;
-         name_29.fogMaxDensity = value;
+         GiShadowMaterial.fogMaxDensity = value;
          this.var_5.fogMaxDensity = value;
       }
       
@@ -234,24 +234,24 @@ package package_18
          MapMaterial.fogColorR = r;
          MapMaterial.fogColorG = g;
          MapMaterial.fogColorB = b;
-         name_7.fogColorR = r;
-         name_7.fogColorG = g;
-         name_7.fogColorB = b;
+         TankMaterial.fogColorR = r;
+         TankMaterial.fogColorG = g;
+         TankMaterial.fogColorB = b;
          TankMaterial2.fogColorR = r;
          TankMaterial2.fogColorG = g;
          TankMaterial2.fogColorB = b;
-         name_33.fogColorR = r;
-         name_33.fogColorG = g;
-         name_33.fogColorB = b;
-         name_10.fogColorR = r;
-         name_10.fogColorG = g;
-         name_10.fogColorB = b;
+         TracksMaterial2.fogColorR = r;
+         TracksMaterial2.fogColorG = g;
+         TracksMaterial2.fogColorB = b;
+         TreesMaterial.fogColorR = r;
+         TreesMaterial.fogColorG = g;
+         TreesMaterial.fogColorB = b;
          name_79.fogColorR = r;
          name_79.fogColorG = g;
          name_79.fogColorB = b;
-         name_29.fogColorR = r;
-         name_29.fogColorG = g;
-         name_29.fogColorB = b;
+         GiShadowMaterial.fogColorR = r;
+         GiShadowMaterial.fogColorG = g;
+         GiShadowMaterial.fogColorB = b;
          this.var_5.name_107 = color;
       }
       
@@ -292,11 +292,11 @@ package package_18
          this.var_6 = new name_93(bitmapData);
          this.method_29(this.var_6);
          MapMaterial.method_33(this.var_6);
-         name_7.method_33(this.var_6);
+         TankMaterial.method_33(this.var_6);
          TankMaterial2.method_33(this.var_6);
-         name_29.method_33(this.var_6);
-         name_33.method_33(this.var_6);
-         name_10.method_33(this.var_6);
+         GiShadowMaterial.method_33(this.var_6);
+         TracksMaterial2.method_33(this.var_6);
+         TreesMaterial.method_33(this.var_6);
          name_79.method_33(this.var_6);
       }
       
diff --git a/src/package_84/name_253.as b/src/package_84/name_253.as
index bc37666..675deec 100644
--- a/src/package_84/name_253.as
+++ b/src/package_84/name_253.as
@@ -12,8 +12,8 @@ package package_84
    import package_21.name_78;
    import package_23.name_208;
    import package_29.MouseEvent3D;
-   import package_3.name_29;
-   import package_3.name_33;
+   import alternativa.tanks.game.entities.tank.graphics.materials.GiShadowMaterial;
+   import alternativa.tanks.game.entities.tank.graphics.materials.TracksMaterial2;
    import package_4.class_5;
    import package_45.name_182;
    import package_46.Matrix4;
@@ -79,15 +79,15 @@ package package_84
          return this.hull;
       }
       
-      public function name_342(tracksMaterial:name_33) : void
+      public function name_342(tracksMaterial:TracksMaterial2) : void
       {
-         this.var_489.material = name_33(tracksMaterial.clone());
+         this.var_489.material = TracksMaterial2(tracksMaterial.clone());
          this.name_337.setMaterialToAllSurfaces(this.var_489.material);
-         this.var_490.material = name_33(tracksMaterial.clone());
+         this.var_490.material = TracksMaterial2(tracksMaterial.clone());
          this.name_340.setMaterialToAllSurfaces(this.var_490.material);
       }
       
-      public function name_344(material:name_29) : void
+      public function name_344(material:GiShadowMaterial) : void
       {
          if(this.shadow != null)
          {
diff --git a/src/package_84/name_595.as b/src/package_84/name_595.as
index f2e9036..fbad168 100644
--- a/src/package_84/name_595.as
+++ b/src/package_84/name_595.as
@@ -3,12 +3,12 @@ package package_84
    import package_19.name_380;
    import package_19.name_528;
    import package_21.name_78;
-   import package_3.name_33;
+   import alternativa.tanks.game.entities.tank.graphics.materials.TracksMaterial2;
    import package_75.name_236;
    
    public class name_595
    {
-      public var material:name_33;
+      public var material:TracksMaterial2;
       
       public var physicsComponent:name_236;