diff --git a/resources/Schema/Entities/AmmunitionHUD.xml b/resources/Schema/Entities/AmmunitionHUD.xml
new file mode 100644
index 00000000..2eaf2753
--- /dev/null
+++ b/resources/Schema/Entities/AmmunitionHUD.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="AmmunitionHUD" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:AmmunitionHUD/>
+    <c:Transform>
+      <Position X="-0.0430000015" Y="0.131501317" Z="-0.0670000017"/>
+      <Scale X="0.400000006" Y="0.400000006" Z="0.400000006"/>
+    </c:Transform>
+  </Components>
+
+  <Children>
+    <Entity name="AmmunitionHUDBackground">
+      <Components>
+        <c:Sprite>
+          <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+          <Color A="0.588235319" B="0" G="0" R="0"/>
+        </c:Sprite>
+        <c:Transform>
+          <Position X="0" Y="0" Z="-0.00200000009"/>
+          <Scale X="0.119999997" Y="0.119999997" Z="0.119999997"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="AmmunitionText">
+      <Components>
+        <c:Transform/>
+      </Components>
+      <Children>
+        <Entity name="MagazineAmmo">
+          <Components>
+            <c:Text>
+              <Content>32</Content>
+              <Resource>Fonts/DroidSans.ttf,64</Resource>
+              <Color A="1" B="3.92156863" G="1.17647064" R="0"/>
+            </c:Text>
+            <c:Transform>
+              <Scale X="0.0599999987" Y="0.0599999987" Z="0.0599999987"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Ammo">
+          <Components>
+            <c:Text>
+              <Content>360</Content>
+              <Resource>Fonts/DroidSans.ttf,64</Resource>
+              <Color A="1" B="3.92156863" G="1.17647064" R="0"/>
+            </c:Text>
+            <c:Transform>
+              <Position X="5.2833886e-05" Y="-0.0407950208" Z="0"/>
+              <Scale X="0.0399999991" Y="0.0399999991" Z="0.0399999991"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
+
+</Entity>
diff --git a/resources/Schema/Entities/CapturePointHUDGroup.xml b/resources/Schema/Entities/CapturePointHUDGroup.xml
index 9dce0ffb..d35e1bde 100644
--- a/resources/Schema/Entities/CapturePointHUDGroup.xml
+++ b/resources/Schema/Entities/CapturePointHUDGroup.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="HudOrigin" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+<Entity name="CapturePointHUD" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
 
   <Components>
     <c:Transform>
-      <Position X="-24.3529072" Y="0" Z="6.95243597"/>
+      <Position X="0" Y="0.190541431" Z="0"/>
+      <Scale X="0.0599999987" Y="0.0599999987" Z="0.0599999987"/>
     </c:Transform>
   </Components>
 
diff --git a/resources/Schema/Entities/HealthHUD.xml b/resources/Schema/Entities/HealthHUD.xml
new file mode 100644
index 00000000..ec781d8f
--- /dev/null
+++ b/resources/Schema/Entities/HealthHUD.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="HealthHUD" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Transform/>
+  </Components>
+
+  <Children>
+    <Entity name="HealthText">
+      <Components>
+        <c:Fill>
+          <Percentage>1</Percentage>
+          <Color A="1" B="1" G="0" R="0"/>
+        </c:Fill>
+        <c:HealthHUD/>
+        <c:Text>
+          <Content>100/100</Content>
+          <Resource>Fonts/DroidSans.ttf,64</Resource>
+          <Color A="0.392156869" B="1" G="0" R="0"/>
+        </c:Text>
+        <c:Transform>
+          <Position X="-0.355000019" Y="-0.203000009" Z="0.0410000011"/>
+          <Scale X="0.0350000001" Y="0.0350000001" Z="0.0350000001"/>
+          <Orientation X="0" Y="0.410000026" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="HealthBar">
+      <Components>
+        <c:Fill>
+          <Percentage>1</Percentage>
+          <Color A="0.196078435" B="1" G="0" R="0"/>
+        </c:Fill>
+        <c:Sprite>
+          <DiffuseTexture>Textures/HealthHUD3.png</DiffuseTexture>
+          <Color A="0.588235319" B="0" G="0" R="0"/>
+        </c:Sprite>
+        <c:HealthHUD/>
+        <c:Transform>
+          <Position X="-0.263000011" Y="-0.185000002" Z="0"/>
+          <Scale X="0.106000006" Y="0.333000004" Z="0.150000006"/>
+          <Orientation X="5.87300014" Y="0" Z="4.71200037"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+  </Children>
+
+</Entity>
diff --git a/resources/Schema/Entities/Player.xml b/resources/Schema/Entities/Player.xml
index 30ae942e..b34669ca 100644
--- a/resources/Schema/Entities/Player.xml
+++ b/resources/Schema/Entities/Player.xml
@@ -69,25 +69,6 @@
             </c:Transform>
           </Components>
           <Children>
-            <Entity name="HealthBar">
-              <Components>
-                <c:Fill>
-                  <Percentage>1</Percentage>
-                  <Color A="0.196078435" B="1" G="0" R="0"/>
-                </c:Fill>
-                <c:Sprite>
-                  <DiffuseTexture>Textures/HealthHUD3.png</DiffuseTexture>
-                  <Color A="0.588235319" B="0" G="0" R="0"/>
-                </c:Sprite>
-                <c:HealthHUD/>
-                <c:Transform>
-                  <Position X="-0.263000011" Y="-0.185000002" Z="0"/>
-                  <Scale X="0.106000006" Y="0.333000004" Z="0.150000006"/>
-                  <Orientation X="5.87300014" Y="0" Z="4.71200037"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
             <Entity name="Crosshair">
               <Components>
                 <c:Sprite>
@@ -279,25 +260,51 @@
                 </Entity>
               </Children>
             </Entity>
-            <Entity name="HealthText">
+            <Entity name="HealthHUD">
               <Components>
-                <c:Fill>
-                  <Percentage>1</Percentage>
-                  <Color A="1" B="1" G="0" R="0"/>
-                </c:Fill>
-                <c:HealthHUD/>
-                <c:Text>
-                  <Content>100/100</Content>
-                  <Resource>Fonts/DroidSans.ttf,64</Resource>
-                  <Color A="0.392156869" B="1" G="0" R="0"/>
-                </c:Text>
-                <c:Transform>
-                  <Position X="-0.355000019" Y="-0.203000009" Z="0.0410000011"/>
-                  <Scale X="0.0350000001" Y="0.0350000001" Z="0.0350000001"/>
-                  <Orientation X="0" Y="0.410000026" Z="0"/>
-                </c:Transform>
+                <c:Transform/>
               </Components>
-              <Children/>
+              <Children>
+                <Entity name="HealthText">
+                  <Components>
+                    <c:Fill>
+                      <Percentage>1</Percentage>
+                      <Color A="1" B="1" G="0" R="0"/>
+                    </c:Fill>
+                    <c:HealthHUD/>
+                    <c:Text>
+                      <Content>100/100</Content>
+                      <Resource>Fonts/DroidSans.ttf,64</Resource>
+                      <Color A="0.392156869" B="1" G="0" R="0"/>
+                    </c:Text>
+                    <c:Transform>
+                      <Position X="-0.355000019" Y="-0.203000009" Z="0.0410000011"/>
+                      <Scale X="0.0350000001" Y="0.0350000001" Z="0.0350000001"/>
+                      <Orientation X="0" Y="0.410000026" Z="0"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="HealthBar">
+                  <Components>
+                    <c:Fill>
+                      <Percentage>1</Percentage>
+                      <Color A="0.196078435" B="1" G="0" R="0"/>
+                    </c:Fill>
+                    <c:Sprite>
+                      <DiffuseTexture>Textures/HealthHUD3.png</DiffuseTexture>
+                      <Color A="0.588235319" B="0" G="0" R="0"/>
+                    </c:Sprite>
+                    <c:HealthHUD/>
+                    <c:Transform>
+                      <Position X="-0.263000011" Y="-0.185000002" Z="0"/>
+                      <Scale X="0.106000006" Y="0.333000004" Z="0.150000006"/>
+                      <Orientation X="5.87300014" Y="0" Z="4.71200037"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
             </Entity>
           </Children>
         </Entity>
@@ -305,7 +312,7 @@
           <Components>
             <c:Animation>
               <AnimationName1>Idle</AnimationName1>
-              <Time1>1.1017089512865343</Time1>
+              <Time1>0.24990652025910975</Time1>
               <Speed1>1</Speed1>
             </c:Animation>
             <c:Model>
@@ -325,8 +332,8 @@
                   <Transparent>true</Transparent>
                 </c:Model>
                 <c:Transform>
-                  <Position X="0.120430365" Y="-0.244535804" Z="-0.181454837"/>
-                  <Orientation X="0.0104046855" Y="-0.00268163485" Z="0.0428442024"/>
+                  <Position X="0.120430604" Y="-0.231020898" Z="-0.181454644"/>
+                  <Orientation X="0.010404571" Y="-0.00268170657" Z="0.0428442396"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -363,7 +370,7 @@
                       </Components>
                       <Children/>
                     </Entity>
-                    <Entity>
+                    <Entity name="AmmunitionText">
                       <Components>
                         <c:Transform/>
                       </Components>
@@ -432,7 +439,7 @@
       <Components>
         <c:Animation>
           <AnimationName1>Idle</AnimationName1>
-          <Time1>1.5336333336960681</Time1>
+          <Time1>1.6484966474501377</Time1>
           <Speed1>1</Speed1>
         </c:Animation>
         <c:AnimationOffset>
@@ -457,8 +464,8 @@
               <Visible>false</Visible>
             </c:Model>
             <c:Transform>
-              <Position X="0.161089346" Y="1.02501774" Z="-0.215083182"/>
-              <Orientation X="-0.0628042594" Y="-0.0464361608" Z="0.119145073"/>
+              <Position X="0.160097197" Y="1.02626872" Z="-0.215123743"/>
+              <Orientation X="-0.0627320632" Y="-0.0421531461" Z="0.119530022"/>
             </c:Transform>
           </Components>
           <Children>