diff --git a/Assets/GameController.cs b/Assets/GameController.cs
index ccc5387..a7c2f6a 100644
--- a/Assets/GameController.cs
+++ b/Assets/GameController.cs
@@ -6,40 +6,56 @@ public class GameController : MonoBehaviour
 {
 
     public Map map;
+    public Player playerclass;
 
+    //map Load
     public Sprite[] sprites;
     public GameObject mapPiece;
     public float tileSize;
     public Vector2 posMultiplyer;
 
-
+    //Ore gen
     public float orePercent;
     public float oreReducer;
 
+    //UI
+    public GUIHandler guiHandler;
+    //Base GUI
     public GameObject load;
     public GameObject menu;
     public Text bar;
     public float loadProgress;
 
 
-    public bool MapLoaded = false;
+    public bool gameIsOn = false;
 
     void Awake()
     {
         DontDestroyOnLoad(transform.gameObject);
     }
 
+    void OnLevelWasLoaded(int level)
+    {
+        if (level == 1)
+        {
+            guiHandler = GameObject.Find("_GUIHandler").GetComponent<GUIHandler>();
+            playerclass = GameObject.FindGameObjectWithTag("Player").GetComponent<Player>();
+        }
+
+    }
 
     public void Update()
     {
-        if (Application.loadedLevelName == "Main" && !MapLoaded)
+        if (Application.loadedLevelName == "Main" && !gameIsOn)
         {
 
             Debug.Log("Jeej!");
 
             sprites = Resources.LoadAll<Sprite>("Texturas");
 
-            Tile[,] t = TerrainGen.Generate(orePercent, oreReducer, 1245);
+            Tile[,] t = TerrainGen.Generate(orePercent, oreReducer, 666421, 2);
+
+            
 
             map = new Map(t);
             Debug.Log(t.Length == null);
@@ -47,11 +63,12 @@ public void Update()
 
             MapLoad.MapDraw(map, mapPiece, sprites, tileSize);
 
-            MapLoaded = true;
+            gameIsOn = true;
+
+            Camera.main.GetComponent<CameraChase>().MapLoaded();
         }
     }
 
-
     public void StartGame()
     {
 
@@ -72,8 +89,8 @@ public IEnumerator LoadLevel(string a)
 
         //while (!async.isDone)
         //{
-            loadProgress = async.progress * 100;
-            bar.text = loadProgress + "!!";
+        loadProgress = async.progress * 100;
+        bar.text = loadProgress + "!!";
 
             yield return async;
         //}
@@ -82,5 +99,26 @@ public IEnumerator LoadLevel(string a)
 
     }
 
+    public void TogleInventory()
+    {
+        if (!(guiHandler.inventoryOn))
+        {
+            Debug.Log("Opening");
+            guiHandler.actionGroup.SetActive(false);
+            guiHandler.InventoryDisplay.gameObject.SetActive(true);
+            playerclass.gameObject.GetComponent<Rigidbody2D>().isKinematic = true;
+            guiHandler.inventoryOn = true;
+            return;
+        }
+        else
+        {
+            Debug.Log("Closing");
+            guiHandler.actionGroup.SetActive(true);
+            guiHandler.InventoryDisplay.gameObject.SetActive(false);
+            playerclass.gameObject.GetComponent<Rigidbody2D>().isKinematic = false;
+            guiHandler.inventoryOn = false;
+            return;
+        }
+    }
 
 }
diff --git a/Assets/Main.unity b/Assets/Main.unity
deleted file mode 100644
index 1642cf8..0000000
Binary files a/Assets/Main.unity and /dev/null differ
diff --git a/Assets/Map.cs b/Assets/Map.cs
index b8df7d8..16cb1fa 100644
--- a/Assets/Map.cs
+++ b/Assets/Map.cs
@@ -11,9 +11,9 @@ public class Map
 
     public Map(Tile[,] inmap)
     {
-        mapHeight = (int)Math.Sqrt(inmap.Length);
+       this.mapHeight = (int)Math.Sqrt(inmap.Length);
 
-        mapArray = new Tile[mapHeight, mapHeight, 2];
+        this.mapArray = new Tile[mapHeight, mapHeight, 2];
 
         for (int i = 0; i < mapHeight; i++)
         {
diff --git a/Assets/MapLoad.cs b/Assets/MapLoad.cs
index 9bf7bf5..570cda8 100644
--- a/Assets/MapLoad.cs
+++ b/Assets/MapLoad.cs
@@ -40,8 +40,8 @@ public static void MapDraw(Map map, GameObject mapPiece, Sprite[] sprites, float
 
                 //Debug.Log(xPos + "," + yPos);
 
-                GameObject go =  GameObject.Instantiate(mapPiece);
-
+                GameObject go = GameObject.Instantiate(mapPiece);
+                go.name = "Tile_" + xPos + "_" + yPos;
                 SpriteRenderer curr = go.GetComponent<SpriteRenderer>();
 
                 curr.sprite = sprites[((int)map.mapArray[xPos, yPos, 0].type)];
@@ -58,4 +58,15 @@ public static void MapDraw(Map map, GameObject mapPiece, Sprite[] sprites, float
         }
     }
 
+
+    public static void MapUpdate(int x, int y, Map map)
+    {
+        Sprite[] sprites = Resources.LoadAll<Sprite>("Texturas");
+
+        GameObject go = GameObject.Find("Tile_" + x + "_" + y);
+        SpriteRenderer curr = go.GetComponent<SpriteRenderer>();
+
+        curr.sprite = sprites[((int)map.mapArray[x, y, 0].type)];
+
+    }
 }
diff --git a/Assets/Ore.cs b/Assets/Ore.cs
deleted file mode 100644
index b85cec8..0000000
--- a/Assets/Ore.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-
-public class Ore : Tile
-{
-    public Tile[,] Spread(Tile[,] map, float h, System.Random rnd, float reduce)
-    {
-        int l = (int)System.Math.Sqrt(map.Length);
-
-        if (x != l - 1)
-        {
-            if ((int)map[x + 1, y].type < (int)base.type)
-            {
-                if (rnd.Next(0, 100) >= h)
-                {
-                    map[x + 1, y] = null;
-                    map[x + 1, y] = new Ore(base.type, x + 1, y);
-
-                    map = ((Ore)map[x + 1, y]).Spread(map, h + reduce, rnd, reduce);
-                }
-            }
-        }
-        if (x != 0)
-        {
-            if ((int)map[x - 1, y].type < (int)base.type)
-            {
-                if (rnd.Next(0, 100) >= h)
-                {
-                    map[x - 1, y] = null;
-                    map[x - 1, y] = new Ore(base.type, x - 1, y);
-
-                    map = ((Ore)map[x - 1, y]).Spread(map, h + reduce, rnd, reduce);
-                }
-            }
-        }
-        if (y != l - 1)
-        {
-            if ((int)map[x, y + 1].type < (int)base.type)
-            {
-                if (rnd.Next(0, 100) >= h)
-                {
-                    map[x, y + 1] = null;
-                    map[x, y + 1] = new Ore(base.type, x, y + 1);
-
-                    map = ((Ore)map[x, y + 1]).Spread(map, h + reduce, rnd, reduce);
-                }
-            }
-        }
-        if (y != 0)
-        {
-            if ((int)map[x, y - 1].type < (int)base.type)
-            {
-                if (rnd.Next(0, 100) >= h)
-                {
-                    map[x, y - 1] = null;
-                    map[x, y - 1] = new Ore(base.type, x, y - 1);
-
-                    map = ((Ore)map[x, y - 1]).Spread(map, h + reduce, rnd, reduce);
-                }
-            }
-        }
-
-        return map;
-    }
-
-
-    public Ore(OreType gettype, int xpos, int ypos)
-        : base(gettype, xpos, ypos)
-    {
-
-
-    }
-
-    public Ore(System.Random rnk, int xpos, int ypos)
-        : base(xpos, ypos)
-    {
-        this.type = (OreType)rnk.Next(1, 6);
-
-
-    }
-}
diff --git a/Assets/scripts/Player.cs.meta b/Assets/Player/Player.cs.meta
similarity index 100%
rename from Assets/scripts/Player.cs.meta
rename to Assets/Player/Player.cs.meta
diff --git a/Assets/PlayerMovment.cs b/Assets/Player/PlayerMovment.cs
similarity index 100%
rename from Assets/PlayerMovment.cs
rename to Assets/Player/PlayerMovment.cs
diff --git a/Assets/PlayerMovment.cs.meta b/Assets/Player/PlayerMovment.cs.meta
similarity index 100%
rename from Assets/PlayerMovment.cs.meta
rename to Assets/Player/PlayerMovment.cs.meta
diff --git a/Assets/Resources/Texturas/1.png.meta b/Assets/Resources/Texturas/1.png.meta
index 801820d..4384467 100644
--- a/Assets/Resources/Texturas/1.png.meta
+++ b/Assets/Resources/Texturas/1.png.meta
@@ -30,7 +30,7 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     filterMode: -1
-    aniso: -1
+    aniso: 16
     mipBias: -1
     wrapMode: 1
   nPOTScale: 0
@@ -43,7 +43,7 @@ TextureImporter:
   alignment: 0
   spritePivot: {x: .5, y: .5}
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spritePixelsToUnits: 100
+  spritePixelsToUnits: 16
   alphaIsTransparency: 1
   textureType: 8
   buildTargetSettings: []
diff --git a/Assets/SandOre.cs b/Assets/SandOre.cs
new file mode 100644
index 0000000..7df3270
--- /dev/null
+++ b/Assets/SandOre.cs
@@ -0,0 +1,8 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+public class SandOre : Ore
+{
+}
diff --git a/Assets/Main.unity.meta b/Assets/Scenes/Main.unity.meta
similarity index 100%
rename from Assets/Main.unity.meta
rename to Assets/Scenes/Main.unity.meta
diff --git a/Assets/Start.unity b/Assets/Scenes/Start.unity
similarity index 83%
rename from Assets/Start.unity
rename to Assets/Scenes/Start.unity
index 1808dcc..b04898c 100644
Binary files a/Assets/Start.unity and b/Assets/Scenes/Start.unity differ
diff --git a/Assets/Start.unity.meta b/Assets/Scenes/Start.unity.meta
similarity index 100%
rename from Assets/Start.unity.meta
rename to Assets/Scenes/Start.unity.meta
diff --git a/Assets/TerrainGen.cs b/Assets/TerrainGen.cs
index b97ec71..fbdc0cd 100644
--- a/Assets/TerrainGen.cs
+++ b/Assets/TerrainGen.cs
@@ -6,15 +6,16 @@ public class TerrainGen{
 
 
 
-        public static Tile[,] Generate(float h, float reduce , int seed)
+        public static Tile[,] Generate(float h, float reduce , int seed,int maxOre)
         {
 
             FileStream file = new FileStream("./file.txt", FileMode.Create);
             StreamWriter wf = new StreamWriter(file);
 
+            
             int gen = 50;
             float[,] h2 = new float[,] { {3f, 15f}, {2f,20f}, {1f,22f}, {0.2f,30f}, {0.1f,40f}, {0.001f,45}};
-            System.Random rand = new System.Random(5000);
+            System.Random rand = new System.Random(seed);
             
             Tile[,] map = new Tile[50, 50];
             Tile initial;
@@ -26,7 +27,7 @@ public class TerrainGen{
             {
                 for (int j = 0; j < gen; j++)
                 {
-                    map[i, j] = new Tile(OreType.Surface, i, j);
+                    map[i, j] = new Tile(i, j);
                 }
             }
 
@@ -34,14 +35,14 @@ public class TerrainGen{
             {
                 for (int j = 0; j < gen; j++)
                 {
-                    initial = new Ore(rand, i, j);
+                    initial = new OreTile(rand, i, j, maxOre);
                     h = h2[(int)initial.type,0];
                     reduce = h2[(int)initial.type, 1];
                     if (rand.Next(0, 100) <= h && !t)
                     {
                         map[i, j] = initial;
 
-                        map = ((Ore)map[i, j]).Spread(map, h, rand, reduce);
+                        map = ((OreTile)map[i, j]).Spread(map, h, rand, reduce, rand.Next(1,maxOre));
 
                         t = false;
                     }
diff --git a/Assets/Tile/OreTile.cs b/Assets/Tile/OreTile.cs
new file mode 100644
index 0000000..95664e5
--- /dev/null
+++ b/Assets/Tile/OreTile.cs
@@ -0,0 +1,99 @@
+
+public class OreTile : Tile
+{
+    public float amount;
+    public float[] miningTime = {0,4,4.5f,5,7,14,3,3};
+
+    public Tile[,] Spread(Tile[,] map, float h, System.Random rnd, float reduce, float amountReduce)
+    {
+        int l = (int)System.Math.Sqrt(map.Length);
+
+        float amountnext = amount;
+
+        if (x != l - 1)
+        {
+            if ((int)map[x + 1, y].type < (int)base.type)
+            {
+                if (rnd.Next(0, 100) >= h)
+                {
+                    map[x + 1, y] = null;
+                    map[x + 1, y] = new OreTile(base.type, x + 1, y, amountnext);
+
+                    map = ((OreTile)map[x + 1, y]).Spread(map, h + reduce, rnd, reduce,amountReduce);
+                }
+            }
+        }
+        if (x != 0)
+        {
+            if ((int)map[x - 1, y].type < (int)base.type)
+            {
+                if (rnd.Next(0, 100) >= h)
+                {
+                    map[x - 1, y] = null;
+                    map[x - 1, y] = new OreTile(base.type, x - 1, y, amountnext);
+
+                    map = ((OreTile)map[x - 1, y]).Spread(map, h + reduce, rnd, reduce, amountReduce);
+                }
+            }
+        }
+        if (y != l - 1)
+        {
+            if ((int)map[x, y + 1].type < (int)base.type)
+            {
+                if (rnd.Next(0, 100) >= h)
+                {
+                    map[x, y + 1] = null;
+                    map[x, y + 1] = new OreTile(base.type, x, y + 1, amountnext);
+
+                    map = ((OreTile)map[x, y + 1]).Spread(map, h + reduce, rnd, reduce, amountReduce);
+                }
+            }
+        }
+        if (y != 0)
+        {
+            if ((int)map[x, y - 1].type < (int)base.type)
+            {
+                if (rnd.Next(0, 100) >= h)
+                {
+                    map[x, y - 1] = null;
+                    map[x, y - 1] = new OreTile(base.type, x, y - 1, amountnext);
+
+                    map = ((OreTile)map[x, y - 1]).Spread(map, h + reduce, rnd, reduce, amountReduce);
+                }
+            }
+        }
+
+        return map;
+    }
+
+    public bool Mine(float minedAmount)
+    {
+        this.amount -= minedAmount;
+        if (this.amount <= 0)
+        {
+            this.type = OreType.Surface;
+            return true;
+        }
+        return false;
+    }
+
+
+
+    public OreTile(OreType gettype, int xpos, int ypos, float amountSet)
+        : base(xpos, ypos)
+    {
+        this.type = gettype;
+        this.amount = amountSet;
+    }
+
+    public OreTile(System.Random rnk, int xpos, int ypos, float amountSet)
+        : base(xpos, ypos)
+    {
+        this.type = (OreType)rnk.Next(1, 6);
+        this.amount = rnk.Next(1,(int)amountSet);
+
+
+    }
+
+   
+}
diff --git a/Assets/Ore.cs.meta b/Assets/Tile/OreTile.cs.meta
similarity index 100%
rename from Assets/Ore.cs.meta
rename to Assets/Tile/OreTile.cs.meta
diff --git a/Assets/OreType.cs b/Assets/Tile/OreType.cs
similarity index 100%
rename from Assets/OreType.cs
rename to Assets/Tile/OreType.cs
diff --git a/Assets/OreType.cs.meta b/Assets/Tile/OreType.cs.meta
similarity index 100%
rename from Assets/OreType.cs.meta
rename to Assets/Tile/OreType.cs.meta
diff --git a/Assets/Tile.cs b/Assets/Tile/Tile.cs
similarity index 53%
rename from Assets/Tile.cs
rename to Assets/Tile/Tile.cs
index 5ada887..e5a5a92 100644
--- a/Assets/Tile.cs
+++ b/Assets/Tile/Tile.cs
@@ -3,12 +3,6 @@ public class Tile
 {
     public OreType type;
     public int x, y;
-    public Tile(OreType t, int xpos, int ypos)
-    {
-        this.type = t;
-        this.x = xpos;
-        this.y = ypos;
-    }
 
     public Tile(int xpos, int ypos)
     {
diff --git a/Assets/Tile.cs.meta b/Assets/Tile/Tile.cs.meta
similarity index 100%
rename from Assets/Tile.cs.meta
rename to Assets/Tile/Tile.cs.meta
diff --git a/Assets/Tiles.cd b/Assets/Tiles.cd
index e3bd310..79f09f7 100644
--- a/Assets/Tiles.cd
+++ b/Assets/Tiles.cd
@@ -7,10 +7,10 @@
       <FileName>Assets\Tile.cs</FileName>
     </TypeIdentifier>
   </Class>
-  <Class Name="Ore">
+  <Class Name="OreTile">
     <Position X="8" Y="0.5" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAA=</HashCode>
+      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAgIAAAAAAAAAAAAA=</HashCode>
       <FileName>Assets\Ore.cs</FileName>
     </TypeIdentifier>
   </Class>
diff --git a/Assets/scripts/Assembler.cs b/Assets/scripts/Assembler.cs
index 64f55db..6a53a8d 100644
--- a/Assets/scripts/Assembler.cs
+++ b/Assets/scripts/Assembler.cs
@@ -3,8 +3,7 @@
 using System.Linq;
 using System.Text;
 
-namespace civmain
-{
+ 
     public class Assembler:Producer
     {
         public int speed;
@@ -14,4 +13,4 @@ public void Production()
             throw new System.NotImplementedException();
         }
     }
-}
+
diff --git a/Assets/scripts/Building.cs b/Assets/scripts/Building.cs
index 9bd6c86..9df2614 100644
--- a/Assets/scripts/Building.cs
+++ b/Assets/scripts/Building.cs
@@ -3,13 +3,15 @@
 using System.Linq;
 using System.Text;
 
-namespace civmain
-{
-    public abstract class Building
+ 
+    public class Building
     {
+        public List<Item> buildingMaterials;
+
+
         public void Usage()
         {
             throw new System.NotImplementedException();
         }
     }
-}
+
diff --git a/Assets/scripts/Class1.cs b/Assets/scripts/Class1.cs
index 6e68c48..9b96647 100644
--- a/Assets/scripts/Class1.cs
+++ b/Assets/scripts/Class1.cs
@@ -1,11 +1,11 @@
 using System.Collections.Generic;
 
 
-namespace civmain
-{
+ 
+
     public class MainBuilding
     {
 
         public int Inventory;
     }
-}
+
diff --git a/Assets/scripts/Food.cs b/Assets/scripts/Food.cs
index 90d70eb..8f860de 100644
--- a/Assets/scripts/Food.cs
+++ b/Assets/scripts/Food.cs
@@ -3,9 +3,8 @@
 using System.Linq;
 using System.Text;
 
-namespace civmain
-{
+ 
     public class Food:Item
     {
     }
-}
+
diff --git a/Assets/scripts/Furnace.cs b/Assets/scripts/Furnace.cs
index 0e4bd9f..23d2da5 100644
--- a/Assets/scripts/Furnace.cs
+++ b/Assets/scripts/Furnace.cs
@@ -3,8 +3,7 @@
 using System.Linq;
 using System.Text;
 
-namespace civmain
-{
+ 
     public class Furnace:Producer
     {
         public int speed;
@@ -14,4 +13,4 @@ public void Production()
             throw new System.NotImplementedException();
         }
     }
-}
+
diff --git a/Assets/scripts/Generato.cs b/Assets/scripts/Generato.cs
index bdfe552..e856266 100644
--- a/Assets/scripts/Generato.cs
+++ b/Assets/scripts/Generato.cs
@@ -3,13 +3,12 @@
 using System.Linq;
 using System.Text;
 
-namespace civmain
-{
+ 
     public class Generator:Building
     {
 
         public MainBuilding main;
-        public int a;
+        public int internalsorage;
 
         public void Gen()
         {}
@@ -17,10 +16,10 @@ public void Gen()
 
         public void Transfer()
         {
-            if (this.a > 1)
+            if (this.internalsorage > 1)
             {
-                main.Inventory =+ this.a;
+                main.Inventory =+ this.internalsorage;
             }
         }
     }
-}
+
diff --git a/Assets/scripts/GlassPLane.cs b/Assets/scripts/GlassPLane.cs
index 16087e7..9464bc9 100644
--- a/Assets/scripts/GlassPLane.cs
+++ b/Assets/scripts/GlassPLane.cs
@@ -3,9 +3,11 @@
 using System.Linq;
 using System.Text;
 
-namespace civmain
-{
+ 
+
     public class GlassPlane:Item
     {
+        public string name = "GlassPlane";
+
     }
-}
+
diff --git a/Assets/scripts/IInventory.cs b/Assets/scripts/IInventory.cs
index 1a53394..03e62e6 100644
--- a/Assets/scripts/IInventory.cs
+++ b/Assets/scripts/IInventory.cs
@@ -3,6 +3,3 @@
 using System.Linq;
 using System.Text;
 
-namespace civmain
-{
-}
diff --git a/Assets/scripts/InteriorPlate.cs b/Assets/scripts/InteriorPlate.cs
index f1e21e1..1a5b741 100644
--- a/Assets/scripts/InteriorPlate.cs
+++ b/Assets/scripts/InteriorPlate.cs
@@ -3,9 +3,9 @@
 using System.Linq;
 using System.Text;
 
-namespace civmain
-{
+ 
     public class InteriorPlate:Item
     {
+        public string name = "InteriorPlate";
     }
-}
+
diff --git a/Assets/scripts/Iron.cs b/Assets/scripts/Iron.cs
index a4371bb..f08062c 100644
--- a/Assets/scripts/Iron.cs
+++ b/Assets/scripts/Iron.cs
@@ -3,9 +3,10 @@
 using System.Linq;
 using System.Text;
 
-namespace civmain
-{
-    public class Iron:Ore
+ 
+    public class IronOre:Ore
     {
+        public string name = "Iron" + "Ore";
+
     }
-}
+
diff --git a/Assets/scripts/IronIngot.cs b/Assets/scripts/IronIngot.cs
index ed07c1c..0809203 100644
--- a/Assets/scripts/IronIngot.cs
+++ b/Assets/scripts/IronIngot.cs
@@ -3,9 +3,9 @@
 using System.Linq;
 using System.Text;
 
-namespace civmain
-{
+ 
     public class IronIngot:Item
     {
+        public string name = "IronIngot";
     }
-}
+
diff --git a/Assets/scripts/IronPipe.cs b/Assets/scripts/IronPipe.cs
index c41f4f4..035bc42 100644
--- a/Assets/scripts/IronPipe.cs
+++ b/Assets/scripts/IronPipe.cs
@@ -3,9 +3,9 @@
 using System.Linq;
 using System.Text;
 
-namespace civmain
-{
+ 
     public class IronPipe:Item
     {
+        public string name = "IronPipe";
     }
-}
+
diff --git a/Assets/scripts/IronPlate.cs b/Assets/scripts/IronPlate.cs
index 0f8d832..97651b0 100644
--- a/Assets/scripts/IronPlate.cs
+++ b/Assets/scripts/IronPlate.cs
@@ -3,9 +3,9 @@
 using System.Linq;
 using System.Text;
 
-namespace civmain
-{
+ 
+
     public class IronPlate:Item
     {
+        public string name = "IronPlate";
     }
-}
diff --git a/Assets/scripts/Item.cs b/Assets/scripts/Item.cs
index 48234c5..989b8d0 100644
--- a/Assets/scripts/Item.cs
+++ b/Assets/scripts/Item.cs
@@ -3,9 +3,11 @@
 using System.Linq;
 using System.Text;
 
-namespace civmain
-{
+ 
+
     public class Item
     {
+        public int amount;
+
     }
-}
+
diff --git a/Assets/scripts/MainDiagram.cd.meta b/Assets/scripts/ItemsDia.cd.meta
similarity index 64%
rename from Assets/scripts/MainDiagram.cd.meta
rename to Assets/scripts/ItemsDia.cd.meta
index 1ece9bd..93782b5 100644
--- a/Assets/scripts/MainDiagram.cd.meta
+++ b/Assets/scripts/ItemsDia.cd.meta
@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 74c7cc69985d0d44a8a7075c4cda6e8f
-timeCreated: 1437723296
+guid: e44dc108d9cc8e745b4b83e9a0b7a660
+timeCreated: 1437854894
 licenseType: Free
 DefaultImporter:
   userData: 
diff --git a/Assets/scripts/MainDiagram.cd b/Assets/scripts/MainDiagram.cd
deleted file mode 100644
index c373ebe..0000000
--- a/Assets/scripts/MainDiagram.cd
+++ /dev/null
@@ -1,228 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ClassDiagram MajorVersion="1" MinorVersion="1">
-  <Class Name="civmain.MainBuilding" Collapsed="true">
-    <Position X="0.5" Y="0.5" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAA=</HashCode>
-      <FileName>Class1.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="civmain.Miner">
-    <Position X="8" Y="0.5" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Miner.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="civmain.Building">
-    <Position X="3" Y="1.75" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Building.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="civmain.SpecMine">
-    <Position X="11.25" Y="0.5" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAIAAAAAAAAAAAAAAAIAAAAAAAABAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>SpecMine.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="civmain.Oxigenerator">
-    <Position X="8" Y="5" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAABAAAIAAAAAAAAAAQAAAAAAAAAAAAA=</HashCode>
-      <FileName>Oxigeneration.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="civmain.Generator">
-    <Position X="5.25" Y="1" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAABAAAAAAQAAAAAAAAAgAAAAAAAAAAQ=</HashCode>
-      <FileName>Generato.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="civmain.UniverzalMiner">
-    <Position X="11.25" Y="2.5" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAIAAAAIAAAAAAAABAQAAAAAAAAAAAAA=</HashCode>
-      <FileName>UniverzalMiner.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="civmain.WareHouse">
-    <Position X="5" Y="5.5" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>WareHouse.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="civmain.Item">
-    <Position X="18.25" Y="0.5" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Item.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="civmain.Ore">
-    <Position X="15.25" Y="6" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Ore.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="civmain.Coal">
-    <Position X="18" Y="8.25" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>coal.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="civmain.Iron">
-    <Position X="15.75" Y="7.75" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Iron.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="civmain.Uranium">
-    <Position X="14" Y="7.75" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Uranium.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="civmain.Food">
-    <Position X="21.75" Y="5.25" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Food.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="civmain.Tool">
-    <Position X="20.75" Y="2" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Tool.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="civmain.ResearchFacility">
-    <Position X="1.75" Y="5.5" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAACABAAAAAAAAAA=</HashCode>
-      <FileName>ResearchFacility.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="civmain.Stone">
-    <Position X="12.25" Y="8" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Stone.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="civmain.Furnace">
-    <Position X="3" Y="8.25" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAABAAAAAAAAAAAAAAQAAAAAAAAAAAAA=</HashCode>
-      <FileName>Furnace.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="civmain.Producer">
-    <Position X="5.5" Y="7.75" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Producer.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="civmain.Assembler">
-    <Position X="5.25" Y="9.25" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAABAAAAAAAAAAAAAAQAAAAAAAAAAAAA=</HashCode>
-      <FileName>Assembler.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="civmain.IronIngot">
-    <Position X="16.75" Y="2.75" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>IronIngot.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="civmain.IronPipe">
-    <Position X="15" Y="3" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>IronPipe.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="civmain.Player">
-    <Position X="0.5" Y="2.25" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAEAAAQAAEAAAAAAAAIAAAAQAAACAAAAAAAAA=</HashCode>
-      <FileName>Player.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="civmain.StoneBrick">
-    <Position X="14.5" Y="0.5" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>StoneBrick.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="civmain.IronPlate">
-    <Position X="19.25" Y="2.75" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>IronPlate.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="civmain.NuclearReactor">
-    <Position X="3" Y="0.5" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>NuclearReactor.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="civmain.GlassPlane">
-    <Position X="22.25" Y="0.5" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>GlassPLane.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="civmain.InteriorPlate">
-    <Position X="23" Y="3.5" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>InteriorPlate.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="civmain.Roof">
-    <Position X="24.25" Y="1.75" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Roof.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="civmain.RefrinedUranium">
-    <Position X="20" Y="6" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>RefrinedUranium.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="civmain.UraniumRefiner">
-    <Position X="7.5" Y="7.75" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAABAAAAAAAAAAAAAAQAAAAAAAAAAAAA=</HashCode>
-      <FileName>UraniumRefiner.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Enum Name="civmain.OreType">
-    <Position X="0.5" Y="1.25" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>OreType.cs</FileName>
-    </TypeIdentifier>
-  </Enum>
-  <Font Name="Segoe UI" Size="9" />
-</ClassDiagram>
\ No newline at end of file
diff --git a/Assets/scripts/Miner.cs b/Assets/scripts/Miner.cs
index c7ddb79..e1403c2 100644
--- a/Assets/scripts/Miner.cs
+++ b/Assets/scripts/Miner.cs
@@ -3,8 +3,8 @@
 using System.Linq;
 using System.Text;
 
-namespace civmain
-{
+ 
+
     public class Miner : Generator
     {
 
@@ -13,4 +13,4 @@ public void Mine()
             throw new System.NotImplementedException();
         }
     }
-}
+
diff --git a/Assets/scripts/NuclearReactor.cs b/Assets/scripts/NuclearReactor.cs
index 64a15ee..2500450 100644
--- a/Assets/scripts/NuclearReactor.cs
+++ b/Assets/scripts/NuclearReactor.cs
@@ -3,10 +3,10 @@
 using System.Linq;
 using System.Text;
 
-namespace civmain
-{
+ 
+
     public class NuclearReactor:Building
     {
         
     }
-}
+
diff --git a/Assets/scripts/Ore.cs b/Assets/scripts/Ore.cs
index 26ac6ba..e743087 100644
--- a/Assets/scripts/Ore.cs
+++ b/Assets/scripts/Ore.cs
@@ -3,9 +3,9 @@
 using System.Linq;
 using System.Text;
 
-namespace civmain
-{
+ 
+
     public class Ore:Item
     {
     }
-}
+
diff --git a/Assets/scripts/OreType.cs b/Assets/scripts/OreType.cs
index 59e7757..3b96b8c 100644
--- a/Assets/scripts/OreType.cs
+++ b/Assets/scripts/OreType.cs
@@ -3,10 +3,4 @@
 using System.Linq;
 using System.Text;
 
-namespace civmain
-{
-    public enum OreType
-    {
-        Surface,
-    }
-}
+
diff --git a/Assets/scripts/Oxigeneration.cs b/Assets/scripts/Oxigeneration.cs
index d9a5933..d9b3e92 100644
--- a/Assets/scripts/Oxigeneration.cs
+++ b/Assets/scripts/Oxigeneration.cs
@@ -3,8 +3,8 @@
 using System.Linq;
 using System.Text;
 
-namespace civmain
-{
+ 
+
     public class Oxigenerator:Generator
     {
         public int speed;
@@ -16,4 +16,4 @@ public void Get(int slot, int amount)
             throw new NotImplementedException();
         }
     }
-}
+
diff --git a/Assets/scripts/Player.cs b/Assets/scripts/Player.cs
deleted file mode 100644
index 856eedb..0000000
--- a/Assets/scripts/Player.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace civmain
-{
-    public class Player
-    {
-        public int eatSpeed;
-        public int breathAmount;
-        public int speed;
-
-        public void Eat()
-        {
-            throw new System.NotImplementedException();
-        }
-
-        public void Breath()
-        {
-            throw new System.NotImplementedException();
-        }
-
-        public void walk()
-        {
-            throw new System.NotImplementedException();
-        }
-    }
-}
diff --git a/Assets/scripts/Producer.cs b/Assets/scripts/Producer.cs
index aebf715..5b72c95 100644
--- a/Assets/scripts/Producer.cs
+++ b/Assets/scripts/Producer.cs
@@ -3,11 +3,13 @@
 using System.Linq;
 using System.Text;
 
-namespace civmain
-{
+ 
+
     public class Producer:Building
     {
         public void Production()
-        {}
+        {
+            throw new System.NotImplementedException();
+        }
     }
-}
+
diff --git a/Assets/scripts/RefrinedUranium.cs b/Assets/scripts/RefrinedUranium.cs
index f36a28b..6a02816 100644
--- a/Assets/scripts/RefrinedUranium.cs
+++ b/Assets/scripts/RefrinedUranium.cs
@@ -3,9 +3,11 @@
 using System.Linq;
 using System.Text;
 
-namespace civmain
-{
+ 
+
     public class RefrinedUranium:Item
     {
+        public string name = "RefrinedUranium";
+
     }
-}
+
diff --git a/Assets/scripts/ResearchFacility.cs b/Assets/scripts/ResearchFacility.cs
index 42b42d5..867b6df 100644
--- a/Assets/scripts/ResearchFacility.cs
+++ b/Assets/scripts/ResearchFacility.cs
@@ -3,8 +3,8 @@
 using System.Linq;
 using System.Text;
 
-namespace civmain
-{
+ 
+
     public class ResearchFacility:Building
     {
         private int researchspeed;
@@ -14,4 +14,4 @@ public void Research()
             throw new System.NotImplementedException();
         }
     }
-}
+
diff --git a/Assets/scripts/Resource.cs b/Assets/scripts/Resource.cs
index 5a1596e..773f40b 100644
--- a/Assets/scripts/Resource.cs
+++ b/Assets/scripts/Resource.cs
@@ -3,9 +3,9 @@
 using System.Linq;
 using System.Text;
 
-namespace civmain
-{
+ 
+
     public class Resource:Item
     {
     }
-}
+
diff --git a/Assets/scripts/Roof.cs b/Assets/scripts/Roof.cs
index 611936d..55c4090 100644
--- a/Assets/scripts/Roof.cs
+++ b/Assets/scripts/Roof.cs
@@ -3,9 +3,9 @@
 using System.Linq;
 using System.Text;
 
-namespace civmain
-{
+ 
+
     public class Roof:Item
     {
+        public string name = "Roof";
     }
-}
diff --git a/Assets/scripts/SpecMine.cs b/Assets/scripts/SpecMine.cs
index e2998bf..066be18 100644
--- a/Assets/scripts/SpecMine.cs
+++ b/Assets/scripts/SpecMine.cs
@@ -3,8 +3,8 @@
 using System.Linq;
 using System.Text;
 
-namespace civmain
-{
+ 
+
     public class SpecMine : Miner
     {
         public OreType type;
@@ -15,4 +15,4 @@ public void Mine()
             throw new System.NotImplementedException();
         }
     }
-}
+
diff --git a/Assets/scripts/Stone.cs b/Assets/scripts/Stone.cs
index f7e0079..fb7515f 100644
--- a/Assets/scripts/Stone.cs
+++ b/Assets/scripts/Stone.cs
@@ -3,9 +3,11 @@
 using System.Linq;
 using System.Text;
 
-namespace civmain
-{
-    public class Stone:Ore
+ 
+
+    public class StoneOre:Ore
     {
+        public string name = "Stone"+"Ore";
+
     }
-}
+
diff --git a/Assets/scripts/StoneBrick.cs b/Assets/scripts/StoneBrick.cs
index f2d4b3b..a34a5c3 100644
--- a/Assets/scripts/StoneBrick.cs
+++ b/Assets/scripts/StoneBrick.cs
@@ -3,9 +3,9 @@
 using System.Linq;
 using System.Text;
 
-namespace civmain
-{
+ 
+
     public class StoneBrick:Item
     {
     }
-}
+
diff --git a/Assets/scripts/Tool.cs b/Assets/scripts/Tool.cs
index 5d700e3..64d14ab 100644
--- a/Assets/scripts/Tool.cs
+++ b/Assets/scripts/Tool.cs
@@ -3,9 +3,9 @@
 using System.Linq;
 using System.Text;
 
-namespace civmain
-{
+ 
+
     public class Tool:Item
     {
     }
-}
+
diff --git a/Assets/scripts/UniverzalMiner.cs b/Assets/scripts/UniverzalMiner.cs
index 057320c..87f18fa 100644
--- a/Assets/scripts/UniverzalMiner.cs
+++ b/Assets/scripts/UniverzalMiner.cs
@@ -3,8 +3,8 @@
 using System.Linq;
 using System.Text;
 
-namespace civmain
-{
+ 
+
     public class UniverzalMiner:Miner
     {
         public int capacity;
@@ -16,4 +16,4 @@ public void MIne()
             throw new System.NotImplementedException();
         }
     }
-}
+
diff --git a/Assets/scripts/Uranium.cs b/Assets/scripts/Uranium.cs
index f460cef..0975df0 100644
--- a/Assets/scripts/Uranium.cs
+++ b/Assets/scripts/Uranium.cs
@@ -3,9 +3,11 @@
 using System.Linq;
 using System.Text;
 
-namespace civmain
-{
-    public class Uranium:Ore
+ 
+
+    public class UraniumOre:Ore
     {
+        public string name = "Uranium" + "Ore";
+
     }
-}
+
diff --git a/Assets/scripts/UraniumRefiner.cs b/Assets/scripts/UraniumRefiner.cs
index 7143f91..83b2fcf 100644
--- a/Assets/scripts/UraniumRefiner.cs
+++ b/Assets/scripts/UraniumRefiner.cs
@@ -3,8 +3,8 @@
 using System.Linq;
 using System.Text;
 
-namespace civmain
-{
+ 
+
     public class UraniumRefiner:Producer
     {
         public int speed;
@@ -14,4 +14,4 @@ public void Production()
             throw new System.NotImplementedException();
         }
     }
-}
+
diff --git a/Assets/scripts/WareHouse.cs b/Assets/scripts/WareHouse.cs
index d68df1f..84a0ada 100644
--- a/Assets/scripts/WareHouse.cs
+++ b/Assets/scripts/WareHouse.cs
@@ -3,9 +3,9 @@
 using System.Linq;
 using System.Text;
 
-namespace civmain
-{
+ 
+
     public class WareHouse:Building
     {
     }
-}
+
diff --git a/Assets/scripts/Wood.cs b/Assets/scripts/Wood.cs
index 7680bdf..71acbeb 100644
--- a/Assets/scripts/Wood.cs
+++ b/Assets/scripts/Wood.cs
@@ -3,9 +3,9 @@
 using System.Linq;
 using System.Text;
 
-namespace civmain
-{
+ 
+
     public class Wood:Resource
     {
     }
-}
+
diff --git a/Assets/scripts/coal.cs b/Assets/scripts/coal.cs
index 6615d54..73f027a 100644
--- a/Assets/scripts/coal.cs
+++ b/Assets/scripts/coal.cs
@@ -3,10 +3,11 @@
 using System.Linq;
 using System.Text;
 
-namespace civmain
-{
-    public class Coal:Ore
+ 
+
+    public class CoalOre:Ore
     {
 
+
     }
-}
+