diff --git a/src/main/java/electrosphere/audio/AudioEngine.java b/src/main/java/electrosphere/audio/AudioEngine.java
index 6533544b..0fffb4e4 100644
--- a/src/main/java/electrosphere/audio/AudioEngine.java
+++ b/src/main/java/electrosphere/audio/AudioEngine.java
@@ -1,5 +1,7 @@
 package electrosphere.audio;
 
+import electrosphere.audio.collision.HitboxAudioService;
+import electrosphere.audio.movement.MovementAudioService;
 import electrosphere.client.entity.camera.CameraEntityUtils;
 import electrosphere.engine.Globals;
 import electrosphere.logger.LoggerInterface;
@@ -65,6 +67,21 @@ public class AudioEngine {
 
     //The list of sources being tracked
     private List<AudioSource> openALSources = new CopyOnWriteArrayList<AudioSource>();
+
+    /**
+     * The virtual audio source manager
+     */
+    public final VirtualAudioSourceManager virtualAudioSourceManager = new VirtualAudioSourceManager();
+
+    /**
+     * The movement audio service
+     */
+    public final MovementAudioService movementAudioService = new MovementAudioService();
+
+    /**
+     * The hitbox audio service
+     */
+    public final HitboxAudioService hitboxAudioService = new HitboxAudioService();
     
 
     /**
@@ -209,6 +226,7 @@ public class AudioEngine {
     public void update(){
         this.updateListener();
         this.updateOpenALSources();
+        this.virtualAudioSourceManager.update((float)Globals.engineState.timekeeper.getSimFrameTime());
     }
 
     /**
diff --git a/src/main/java/electrosphere/audio/collision/HitboxAudioService.java b/src/main/java/electrosphere/audio/collision/HitboxAudioService.java
index 707891b6..2c850a46 100644
--- a/src/main/java/electrosphere/audio/collision/HitboxAudioService.java
+++ b/src/main/java/electrosphere/audio/collision/HitboxAudioService.java
@@ -50,7 +50,7 @@ public class HitboxAudioService {
     public void playAudio(Entity senderEntity, Entity receiverEntity, String hitboxType, String hurtboxType){
         String audioPath = this.getAudioPath(senderEntity, receiverEntity, hitboxType, hurtboxType);
         if(audioPath != null){
-            Globals.virtualAudioSourceManager.createVirtualAudioSource(audioPath, VirtualAudioSourceType.CREATURE, false);
+            Globals.audioEngine.virtualAudioSourceManager.createVirtualAudioSource(audioPath, VirtualAudioSourceType.CREATURE, false);
         }
     }
 
@@ -62,8 +62,8 @@ public class HitboxAudioService {
      */
     public void playAudioPositional(Entity senderEntity, Entity receiverEntity, String hitboxType, String hurtboxType, Vector3d position){
         String audioPath = this.getAudioPath(senderEntity, receiverEntity, hitboxType, hurtboxType);
-        if(audioPath != null && Globals.virtualAudioSourceManager != null){
-            Globals.virtualAudioSourceManager.createVirtualAudioSource(audioPath, VirtualAudioSourceType.CREATURE, false, position);
+        if(audioPath != null && Globals.audioEngine != null){
+            Globals.audioEngine.virtualAudioSourceManager.createVirtualAudioSource(audioPath, VirtualAudioSourceType.CREATURE, false, position);
         }
     }
 
diff --git a/src/main/java/electrosphere/audio/movement/MovementAudioService.java b/src/main/java/electrosphere/audio/movement/MovementAudioService.java
index b84c0523..39d0d486 100644
--- a/src/main/java/electrosphere/audio/movement/MovementAudioService.java
+++ b/src/main/java/electrosphere/audio/movement/MovementAudioService.java
@@ -161,7 +161,7 @@ public class MovementAudioService {
         if(Globals.RUN_AUDIO){
             String audioPath = this.getAudioPath(voxelType, type);
             if(audioPath != null){
-                Globals.virtualAudioSourceManager.createVirtualAudioSource(audioPath, VirtualAudioSourceType.CREATURE, false);
+                Globals.audioEngine.virtualAudioSourceManager.createVirtualAudioSource(audioPath, VirtualAudioSourceType.CREATURE, false);
             }
         }
     }
@@ -176,7 +176,7 @@ public class MovementAudioService {
         if(Globals.RUN_AUDIO){
             String audioPath = this.getAudioPath(voxelType, type);
             if(audioPath != null){
-                Globals.virtualAudioSourceManager.createVirtualAudioSource(audioPath, VirtualAudioSourceType.CREATURE, false, position);
+                Globals.audioEngine.virtualAudioSourceManager.createVirtualAudioSource(audioPath, VirtualAudioSourceType.CREATURE, false, position);
             }
         }
     }
diff --git a/src/main/java/electrosphere/client/collision/ClientNetworkHitboxCollision.java b/src/main/java/electrosphere/client/collision/ClientNetworkHitboxCollision.java
index 41b274b4..84509a9e 100644
--- a/src/main/java/electrosphere/client/collision/ClientNetworkHitboxCollision.java
+++ b/src/main/java/electrosphere/client/collision/ClientNetworkHitboxCollision.java
@@ -27,11 +27,11 @@ public class ClientNetworkHitboxCollision {
                 switch(hurtboxType){
                     case HitboxData.HITBOX_TYPE_HURT:
                     case HitboxData.HITBOX_TYPE_HURT_CONNECTED: {
-                        Globals.hitboxAudioService.playAudioPositional(senderEntity, receiverEntity, hitboxType, hurtboxType, position);
+                        Globals.audioEngine.hitboxAudioService.playAudioPositional(senderEntity, receiverEntity, hitboxType, hurtboxType, position);
                         ClientNetworkHitboxCollision.conditionallySpawnParticles(senderEntity, receiverEntity, hitboxType, hurtboxType, position);
                     } break;
                     case HitboxData.HITBOX_TYPE_BLOCK_CONNECTED: {
-                        Globals.hitboxAudioService.playAudioPositional(senderEntity, receiverEntity, hitboxType, hurtboxType, position);
+                        Globals.audioEngine.hitboxAudioService.playAudioPositional(senderEntity, receiverEntity, hitboxType, hurtboxType, position);
                         ClientNetworkHitboxCollision.conditionallySpawnParticles(senderEntity, receiverEntity, hitboxType, hurtboxType, position);
                     } break;
                     default: {
diff --git a/src/main/java/electrosphere/client/interact/ItemActions.java b/src/main/java/electrosphere/client/interact/ItemActions.java
index 47ae0c14..fd030003 100644
--- a/src/main/java/electrosphere/client/interact/ItemActions.java
+++ b/src/main/java/electrosphere/client/interact/ItemActions.java
@@ -85,7 +85,7 @@ public class ItemActions {
                     }
                     if(data.getPrimaryUsage().getBlockId() != null){
                         BlockEditing.destroyBlock();
-                        Globals.virtualAudioSourceManager.createVirtualAudioSource(AssetDataStrings.INTERACT_SFX_BLOCK_PLACE, VirtualAudioSourceType.CREATURE, false);
+                        Globals.audioEngine.virtualAudioSourceManager.createVirtualAudioSource(AssetDataStrings.INTERACT_SFX_BLOCK_PLACE, VirtualAudioSourceType.CREATURE, false);
                     }
                     if(data.getPrimaryUsage().getSuppressServerRequest() != null && data.getPrimaryUsage().getSuppressServerRequest() == true){
                         sendServerMessage = false;
@@ -195,7 +195,7 @@ public class ItemActions {
                     }
                     if(data.getSecondaryUsage().getBlockId() != null){
                         BlockEditing.editBlock((short)(int)data.getSecondaryUsage().getBlockId(),(short)0);
-                        Globals.virtualAudioSourceManager.createVirtualAudioSource(AssetDataStrings.INTERACT_SFX_BLOCK_PLACE, VirtualAudioSourceType.CREATURE, false);
+                        Globals.audioEngine.virtualAudioSourceManager.createVirtualAudioSource(AssetDataStrings.INTERACT_SFX_BLOCK_PLACE, VirtualAudioSourceType.CREATURE, false);
                     }
                     if(data.getSecondaryUsage().getSuppressServerRequest() != null && data.getSecondaryUsage().getSuppressServerRequest() == true){
                         sendServerMessage = false;
diff --git a/src/main/java/electrosphere/client/script/ScriptClientVoxelUtils.java b/src/main/java/electrosphere/client/script/ScriptClientVoxelUtils.java
index 337b6cf3..c5ef4944 100644
--- a/src/main/java/electrosphere/client/script/ScriptClientVoxelUtils.java
+++ b/src/main/java/electrosphere/client/script/ScriptClientVoxelUtils.java
@@ -56,7 +56,7 @@ public class ScriptClientVoxelUtils {
             }
             if(Globals.clientState.clientSelectedVoxelType != null){
                 TerrainEditing.editTerrain(cursorPos, 1.1f, Globals.clientState.clientSelectedVoxelType.getId(), EDIT_INCREMENT);
-                Globals.movementAudioService.getAudioPath(Globals.clientState.clientSelectedVoxelType.getId(), InteractionType.STEP_SHOE_REG);
+                Globals.audioEngine.movementAudioService.getAudioPath(Globals.clientState.clientSelectedVoxelType.getId(), InteractionType.STEP_SHOE_REG);
             }
         }
     }
@@ -115,7 +115,7 @@ public class ScriptClientVoxelUtils {
                 cursorPos = new Vector3d(centerPos).add(new Vector3d(eyePos).mul(-CollisionEngine.DEFAULT_INTERACT_DISTANCE));
             }
             TerrainEditing.removeTerrainGated(cursorPos, 1.1f, REMOVE_INCREMENT);
-            Globals.virtualAudioSourceManager.createVirtualAudioSource(AssetDataStrings.INTERACT_SFX_DIG, VirtualAudioSourceType.CREATURE, false);
+            Globals.audioEngine.virtualAudioSourceManager.createVirtualAudioSource(AssetDataStrings.INTERACT_SFX_DIG, VirtualAudioSourceType.CREATURE, false);
         }
     }
 
diff --git a/src/main/java/electrosphere/client/ui/components/EquipmentInventoryPanel.java b/src/main/java/electrosphere/client/ui/components/EquipmentInventoryPanel.java
index 42544cd0..131d0c98 100644
--- a/src/main/java/electrosphere/client/ui/components/EquipmentInventoryPanel.java
+++ b/src/main/java/electrosphere/client/ui/components/EquipmentInventoryPanel.java
@@ -56,12 +56,12 @@ public class EquipmentInventoryPanel {
             LoggerInterface.loggerUI.INFO("Character inventory received drag release event");
             if(Globals.clientState.draggedItem != null){
                 //play sound effect
-                if(Globals.virtualAudioSourceManager != null){
+                if(Globals.audioEngine != null){
                     Item itemData = Globals.gameConfigCurrent.getItemMap().getItem(ItemUtils.getType(Globals.clientState.draggedItem));
                     if(itemData.getItemAudio() != null && itemData.getItemAudio().getUIReleaseAudio() != null){
-                        Globals.virtualAudioSourceManager.createVirtualAudioSource(itemData.getItemAudio().getUIReleaseAudio(), VirtualAudioSourceType.UI, false);
+                        Globals.audioEngine.virtualAudioSourceManager.createVirtualAudioSource(itemData.getItemAudio().getUIReleaseAudio(), VirtualAudioSourceType.UI, false);
                     } else {
-                        Globals.virtualAudioSourceManager.createVirtualAudioSource(AssetDataStrings.UI_SFX_ITEM_RELEASE, VirtualAudioSourceType.UI, false);
+                        Globals.audioEngine.virtualAudioSourceManager.createVirtualAudioSource(AssetDataStrings.UI_SFX_ITEM_RELEASE, VirtualAudioSourceType.UI, false);
                     }
                 }
                 //null out global state
@@ -152,12 +152,12 @@ public class EquipmentInventoryPanel {
                                 panel.setAbsolutePosition(true);
                                 WindowUtils.replaceWindow(WindowStrings.WINDOW_CHARACTER, InventoryMainWindow.createInventoryWindow(Globals.clientState.playerEntity));
                                 //play sound effect
-                                if(Globals.virtualAudioSourceManager != null){
+                                if(Globals.audioEngine != null){
                                     Item itemData = Globals.gameConfigCurrent.getItemMap().getItem(ItemUtils.getType(finalEnt));
                                     if(itemData.getItemAudio() != null && itemData.getItemAudio().getUIGrabAudio() != null){
-                                        Globals.virtualAudioSourceManager.createVirtualAudioSource(itemData.getItemAudio().getUIGrabAudio(), VirtualAudioSourceType.UI, false);
+                                        Globals.audioEngine.virtualAudioSourceManager.createVirtualAudioSource(itemData.getItemAudio().getUIGrabAudio(), VirtualAudioSourceType.UI, false);
                                     } else {
-                                        Globals.virtualAudioSourceManager.createVirtualAudioSource(AssetDataStrings.UI_SFX_ITEM_GRAB, VirtualAudioSourceType.UI, false);
+                                        Globals.audioEngine.virtualAudioSourceManager.createVirtualAudioSource(AssetDataStrings.UI_SFX_ITEM_GRAB, VirtualAudioSourceType.UI, false);
                                     }
                                 }
                                 return false;
@@ -191,12 +191,12 @@ public class EquipmentInventoryPanel {
                                         ClientEquipState equipState = ClientEquipState.getEquipState(Globals.clientState.playerEntity);
                                         equipState.commandAttemptEquip(Globals.clientState.draggedItem,inventory.getEquipPointFromSlot(slots.get(itemId)));
                                         //play sound effect
-                                        if(Globals.virtualAudioSourceManager != null){
+                                        if(Globals.audioEngine != null){
                                             Item itemData = Globals.gameConfigCurrent.getItemMap().getItem(ItemUtils.getType(finalEnt));
                                             if(itemData != null && itemData.getItemAudio() != null && itemData.getItemAudio().getUIReleaseAudio() != null){
-                                                Globals.virtualAudioSourceManager.createVirtualAudioSource(itemData.getItemAudio().getUIReleaseAudio(), VirtualAudioSourceType.UI, false);
+                                                Globals.audioEngine.virtualAudioSourceManager.createVirtualAudioSource(itemData.getItemAudio().getUIReleaseAudio(), VirtualAudioSourceType.UI, false);
                                             } else {
-                                                Globals.virtualAudioSourceManager.createVirtualAudioSource(AssetDataStrings.UI_SFX_ITEM_RELEASE, VirtualAudioSourceType.UI, false);
+                                                Globals.audioEngine.virtualAudioSourceManager.createVirtualAudioSource(AssetDataStrings.UI_SFX_ITEM_RELEASE, VirtualAudioSourceType.UI, false);
                                             }
                                         }
                                     } else if(inventory.canEquipItemToCombinedSlot(Globals.clientState.draggedItem, slots.get(itemId))){
@@ -214,12 +214,12 @@ public class EquipmentInventoryPanel {
                                     ClientEquipState equipState = ClientEquipState.getEquipState(Globals.clientState.playerEntity);
                                     equipState.commandAttemptEquip(Globals.clientState.draggedItem,inventory.getEquipPointFromSlot(slots.get(itemId)));
                                     //play sound effect
-                                    if(Globals.virtualAudioSourceManager != null){
+                                    if(Globals.audioEngine != null){
                                         Item itemData = Globals.gameConfigCurrent.getItemMap().getItem(ItemUtils.getType(finalEnt));
                                         if(itemData != null && itemData.getItemAudio() != null && itemData.getItemAudio().getUIReleaseAudio() != null){
-                                            Globals.virtualAudioSourceManager.createVirtualAudioSource(itemData.getItemAudio().getUIReleaseAudio(), VirtualAudioSourceType.UI, false);
+                                            Globals.audioEngine.virtualAudioSourceManager.createVirtualAudioSource(itemData.getItemAudio().getUIReleaseAudio(), VirtualAudioSourceType.UI, false);
                                         } else {
-                                            Globals.virtualAudioSourceManager.createVirtualAudioSource(AssetDataStrings.UI_SFX_ITEM_RELEASE, VirtualAudioSourceType.UI, false);
+                                            Globals.audioEngine.virtualAudioSourceManager.createVirtualAudioSource(AssetDataStrings.UI_SFX_ITEM_RELEASE, VirtualAudioSourceType.UI, false);
                                         }
                                     }
                                 } else if(inventory.canEquipItemToCombinedSlot(Globals.clientState.draggedItem, slots.get(itemId))){
@@ -230,12 +230,12 @@ public class EquipmentInventoryPanel {
                                 }
                             }
                             //play sound effect
-                            if(Globals.virtualAudioSourceManager != null){
+                            if(Globals.audioEngine != null){
                                 Item itemData = Globals.gameConfigCurrent.getItemMap().getItem(ItemUtils.getType(Globals.clientState.draggedItem));
                                 if(itemData.getItemAudio() != null && itemData.getItemAudio().getUIReleaseAudio() != null){
-                                    Globals.virtualAudioSourceManager.createVirtualAudioSource(itemData.getItemAudio().getUIReleaseAudio(), VirtualAudioSourceType.UI, false);
+                                    Globals.audioEngine.virtualAudioSourceManager.createVirtualAudioSource(itemData.getItemAudio().getUIReleaseAudio(), VirtualAudioSourceType.UI, false);
                                 } else {
-                                    Globals.virtualAudioSourceManager.createVirtualAudioSource(AssetDataStrings.UI_SFX_ITEM_RELEASE, VirtualAudioSourceType.UI, false);
+                                    Globals.audioEngine.virtualAudioSourceManager.createVirtualAudioSource(AssetDataStrings.UI_SFX_ITEM_RELEASE, VirtualAudioSourceType.UI, false);
                                 }
                             }
                             //update ui
diff --git a/src/main/java/electrosphere/client/ui/components/ItemIconPanel.java b/src/main/java/electrosphere/client/ui/components/ItemIconPanel.java
index b37e6da7..2407d689 100644
--- a/src/main/java/electrosphere/client/ui/components/ItemIconPanel.java
+++ b/src/main/java/electrosphere/client/ui/components/ItemIconPanel.java
@@ -86,12 +86,12 @@ public class ItemIconPanel {
             panel.setPositionY(panel.getAbsoluteY());
             WindowUtils.replaceWindow(WindowStrings.WINDOW_CHARACTER, InventoryMainWindow.createInventoryWindow(Globals.clientState.playerEntity));
             //play sound effect
-            if(Globals.virtualAudioSourceManager != null){
+            if(Globals.audioEngine != null){
                 Item itemData = Globals.gameConfigCurrent.getItemMap().getItem(ItemUtils.getType(finalEnt));
                 if(itemData.getItemAudio() != null && itemData.getItemAudio().getUIGrabAudio() != null){
-                    Globals.virtualAudioSourceManager.createVirtualAudioSource(itemData.getItemAudio().getUIGrabAudio(), VirtualAudioSourceType.UI, false);
+                    Globals.audioEngine.virtualAudioSourceManager.createVirtualAudioSource(itemData.getItemAudio().getUIGrabAudio(), VirtualAudioSourceType.UI, false);
                 } else {
-                    Globals.virtualAudioSourceManager.createVirtualAudioSource(AssetDataStrings.UI_SFX_ITEM_GRAB, VirtualAudioSourceType.UI, false);
+                    Globals.audioEngine.virtualAudioSourceManager.createVirtualAudioSource(AssetDataStrings.UI_SFX_ITEM_GRAB, VirtualAudioSourceType.UI, false);
                 }
             }
             return false;
@@ -181,11 +181,11 @@ public class ItemIconPanel {
         panel.setOnDragRelease(new DragEventCallback(){public boolean execute(DragEvent event){
             onReceiveItem.run();
             Item itemData = Globals.gameConfigCurrent.getItemMap().getItem(ItemUtils.getType(Globals.clientState.draggedItem));
-            if(Globals.virtualAudioSourceManager != null){
+            if(Globals.audioEngine != null){
                 if(itemData != null && itemData.getItemAudio() != null && itemData.getItemAudio().getUIReleaseAudio() != null){
-                    Globals.virtualAudioSourceManager.createVirtualAudioSource(itemData.getItemAudio().getUIReleaseAudio(), VirtualAudioSourceType.UI, false);
+                    Globals.audioEngine.virtualAudioSourceManager.createVirtualAudioSource(itemData.getItemAudio().getUIReleaseAudio(), VirtualAudioSourceType.UI, false);
                 } else {
-                    Globals.virtualAudioSourceManager.createVirtualAudioSource(AssetDataStrings.UI_SFX_ITEM_RELEASE, VirtualAudioSourceType.UI, false);
+                    Globals.audioEngine.virtualAudioSourceManager.createVirtualAudioSource(AssetDataStrings.UI_SFX_ITEM_RELEASE, VirtualAudioSourceType.UI, false);
                 }
             }
             //update ui
diff --git a/src/main/java/electrosphere/client/ui/components/NaturalInventoryPanel.java b/src/main/java/electrosphere/client/ui/components/NaturalInventoryPanel.java
index ba16ee6b..2b8188de 100644
--- a/src/main/java/electrosphere/client/ui/components/NaturalInventoryPanel.java
+++ b/src/main/java/electrosphere/client/ui/components/NaturalInventoryPanel.java
@@ -80,12 +80,12 @@ public class NaturalInventoryPanel {
                 }
             }
             //play sound effect
-            if(Globals.virtualAudioSourceManager != null){
+            if(Globals.audioEngine != null){
                 Item itemData = Globals.gameConfigCurrent.getItemMap().getItem(ItemUtils.getType(Globals.clientState.draggedItem));
                 if(itemData.getItemAudio() != null && itemData.getItemAudio().getUIReleaseAudio() != null){
-                    Globals.virtualAudioSourceManager.createVirtualAudioSource(itemData.getItemAudio().getUIReleaseAudio(), VirtualAudioSourceType.UI, false);
+                    Globals.audioEngine.virtualAudioSourceManager.createVirtualAudioSource(itemData.getItemAudio().getUIReleaseAudio(), VirtualAudioSourceType.UI, false);
                 } else {
-                    Globals.virtualAudioSourceManager.createVirtualAudioSource(AssetDataStrings.UI_SFX_ITEM_RELEASE, VirtualAudioSourceType.UI, false);
+                    Globals.audioEngine.virtualAudioSourceManager.createVirtualAudioSource(AssetDataStrings.UI_SFX_ITEM_RELEASE, VirtualAudioSourceType.UI, false);
                 }
             }
             //clear ui
diff --git a/src/main/java/electrosphere/client/ui/components/ToolbarInventoryPanel.java b/src/main/java/electrosphere/client/ui/components/ToolbarInventoryPanel.java
index 4f54e980..c6f4b0c9 100644
--- a/src/main/java/electrosphere/client/ui/components/ToolbarInventoryPanel.java
+++ b/src/main/java/electrosphere/client/ui/components/ToolbarInventoryPanel.java
@@ -90,12 +90,12 @@ public class ToolbarInventoryPanel {
                 }
             }
             //play sound effect
-            if(Globals.virtualAudioSourceManager != null){
+            if(Globals.audioEngine != null){
                 Item itemData = Globals.gameConfigCurrent.getItemMap().getItem(ItemUtils.getType(Globals.clientState.draggedItem));
                 if(itemData.getItemAudio() != null && itemData.getItemAudio().getUIReleaseAudio() != null){
-                    Globals.virtualAudioSourceManager.createVirtualAudioSource(itemData.getItemAudio().getUIReleaseAudio(), VirtualAudioSourceType.UI, false);
+                    Globals.audioEngine.virtualAudioSourceManager.createVirtualAudioSource(itemData.getItemAudio().getUIReleaseAudio(), VirtualAudioSourceType.UI, false);
                 } else {
-                    Globals.virtualAudioSourceManager.createVirtualAudioSource(AssetDataStrings.UI_SFX_ITEM_RELEASE, VirtualAudioSourceType.UI, false);
+                    Globals.audioEngine.virtualAudioSourceManager.createVirtualAudioSource(AssetDataStrings.UI_SFX_ITEM_RELEASE, VirtualAudioSourceType.UI, false);
                 }
             }
             //clear ui
diff --git a/src/main/java/electrosphere/client/ui/menu/WindowUtils.java b/src/main/java/electrosphere/client/ui/menu/WindowUtils.java
index d0af2e97..d35f520c 100644
--- a/src/main/java/electrosphere/client/ui/menu/WindowUtils.java
+++ b/src/main/java/electrosphere/client/ui/menu/WindowUtils.java
@@ -311,8 +311,8 @@ public class WindowUtils {
                 Globals.elementService.focusFirstElement();
                 Globals.controlHandler.hintUpdateControlState(ControlsState.IN_GAME_MAIN_MENU);
                 //play sound effect
-                if(Globals.virtualAudioSourceManager != null){
-                    Globals.virtualAudioSourceManager.createVirtualAudioSource(AssetDataStrings.UI_TONE_CONFIRM_PRIMARY, VirtualAudioSourceType.UI, false);
+                if(Globals.audioEngine != null){
+                    Globals.audioEngine.virtualAudioSourceManager.createVirtualAudioSource(AssetDataStrings.UI_TONE_CONFIRM_PRIMARY, VirtualAudioSourceType.UI, false);
                 }
                 Globals.renderingEngine.getPostProcessingPipeline().setApplyBlur(true);
             } break;
diff --git a/src/main/java/electrosphere/client/ui/menu/debug/audio/ImGuiAudio.java b/src/main/java/electrosphere/client/ui/menu/debug/audio/ImGuiAudio.java
index 60abc324..06f385fd 100644
--- a/src/main/java/electrosphere/client/ui/menu/debug/audio/ImGuiAudio.java
+++ b/src/main/java/electrosphere/client/ui/menu/debug/audio/ImGuiAudio.java
@@ -34,7 +34,7 @@ public class ImGuiAudio {
                 //audio engine details
                 ImGui.text("Audio Engine Details");
                 ImGui.text("Virtual Audio Source Manager Details");
-                ImGui.text("Total number active virtual sources: " + Globals.virtualAudioSourceManager.getSourceQueue().size());
+                ImGui.text("Total number active virtual sources: " + Globals.audioEngine.virtualAudioSourceManager.getSourceQueue().size());
                 if(ImGui.collapsingHeader("Engine Configuration")){
                     ImGui.text("Current audio device: " + Globals.audioEngine.getDevice());
                     ImGui.text("Default audio device: " + Globals.audioEngine.getDefaultDevice());
@@ -50,7 +50,7 @@ public class ImGuiAudio {
                 }
                 //only active children
                 if(ImGui.collapsingHeader("Mapped Virtual Sources")){
-                    for(VirtualAudioSource source : Globals.virtualAudioSourceManager.getMappedSources()){
+                    for(VirtualAudioSource source : Globals.audioEngine.virtualAudioSourceManager.getMappedSources()){
                         ImGui.text("Source " + source.getPriority());
                         ImGui.text(" - Position " + source.getPosition());
                         ImGui.text(" - Gain " + source.getGain());
@@ -61,7 +61,7 @@ public class ImGuiAudio {
                 }
                 //all virtual children
                 if(ImGui.collapsingHeader("All Virtual Sources")){
-                    for(VirtualAudioSource source : Globals.virtualAudioSourceManager.getSourceQueue()){
+                    for(VirtualAudioSource source : Globals.audioEngine.virtualAudioSourceManager.getSourceQueue()){
                         ImGui.text("Position " + source.getPosition());
                     }
                 }
@@ -81,27 +81,27 @@ public class ImGuiAudio {
                 if(ImGui.collapsingHeader("Spatial Testing")){
                     if(ImGui.button("Front")){
                         AudioListener listener = Globals.audioEngine.getListener();
-                        Globals.virtualAudioSourceManager.createVirtualAudioSource("/Audio/movement/surface/dirt/Bare Step Gravel Medium A.wav", VirtualAudioSourceType.UI, false, new Vector3d(listener.getPosition()).add(listener.getEyeVector()));
+                        Globals.audioEngine.virtualAudioSourceManager.createVirtualAudioSource("/Audio/movement/surface/dirt/Bare Step Gravel Medium A.wav", VirtualAudioSourceType.UI, false, new Vector3d(listener.getPosition()).add(listener.getEyeVector()));
                     }
                     if(ImGui.button("Back")){
                         AudioListener listener = Globals.audioEngine.getListener();
-                        Globals.virtualAudioSourceManager.createVirtualAudioSource("/Audio/movement/surface/dirt/Bare Step Gravel Medium A.wav", VirtualAudioSourceType.UI, false, new Vector3d(listener.getPosition()).sub(listener.getEyeVector()));
+                        Globals.audioEngine.virtualAudioSourceManager.createVirtualAudioSource("/Audio/movement/surface/dirt/Bare Step Gravel Medium A.wav", VirtualAudioSourceType.UI, false, new Vector3d(listener.getPosition()).sub(listener.getEyeVector()));
                     }
                     if(ImGui.button("Above")){
                         AudioListener listener = Globals.audioEngine.getListener();
-                        Globals.virtualAudioSourceManager.createVirtualAudioSource("/Audio/movement/surface/dirt/Bare Step Gravel Medium A.wav", VirtualAudioSourceType.UI, false, new Vector3d(listener.getPosition()).add(listener.getUpVector()));
+                        Globals.audioEngine.virtualAudioSourceManager.createVirtualAudioSource("/Audio/movement/surface/dirt/Bare Step Gravel Medium A.wav", VirtualAudioSourceType.UI, false, new Vector3d(listener.getPosition()).add(listener.getUpVector()));
                     }
                     if(ImGui.button("Below")){
                         AudioListener listener = Globals.audioEngine.getListener();
-                        Globals.virtualAudioSourceManager.createVirtualAudioSource("/Audio/movement/surface/dirt/Bare Step Gravel Medium A.wav", VirtualAudioSourceType.UI, false, new Vector3d(listener.getPosition()).sub(listener.getUpVector()));
+                        Globals.audioEngine.virtualAudioSourceManager.createVirtualAudioSource("/Audio/movement/surface/dirt/Bare Step Gravel Medium A.wav", VirtualAudioSourceType.UI, false, new Vector3d(listener.getPosition()).sub(listener.getUpVector()));
                     }
                     if(ImGui.button("Left")){
                         AudioListener listener = Globals.audioEngine.getListener();
-                        Globals.virtualAudioSourceManager.createVirtualAudioSource("/Audio/movement/surface/dirt/Bare Step Gravel Medium A.wav", VirtualAudioSourceType.UI, false, new Vector3d(listener.getPosition()).add(listener.getEyeVector().cross(listener.getUpVector())));
+                        Globals.audioEngine.virtualAudioSourceManager.createVirtualAudioSource("/Audio/movement/surface/dirt/Bare Step Gravel Medium A.wav", VirtualAudioSourceType.UI, false, new Vector3d(listener.getPosition()).add(listener.getEyeVector().cross(listener.getUpVector())));
                     }
                     if(ImGui.button("Right")){
                         AudioListener listener = Globals.audioEngine.getListener();
-                        Globals.virtualAudioSourceManager.createVirtualAudioSource("/Audio/movement/surface/dirt/Bare Step Gravel Medium A.wav", VirtualAudioSourceType.UI, false, new Vector3d(listener.getPosition()).sub(listener.getEyeVector().cross(listener.getUpVector())));
+                        Globals.audioEngine.virtualAudioSourceManager.createVirtualAudioSource("/Audio/movement/surface/dirt/Bare Step Gravel Medium A.wav", VirtualAudioSourceType.UI, false, new Vector3d(listener.getPosition()).sub(listener.getEyeVector().cross(listener.getUpVector())));
                     }
                 }
             }
diff --git a/src/main/java/electrosphere/client/ui/menu/ingame/CraftingWindow.java b/src/main/java/electrosphere/client/ui/menu/ingame/CraftingWindow.java
index 71885bac..4efc84d7 100644
--- a/src/main/java/electrosphere/client/ui/menu/ingame/CraftingWindow.java
+++ b/src/main/java/electrosphere/client/ui/menu/ingame/CraftingWindow.java
@@ -43,8 +43,8 @@ public class CraftingWindow {
             } else {
                 Globals.controlHandler.hintUpdateControlState(ControlsState.IN_GAME_FREE_CAMERA);
             }
-            if(Globals.virtualAudioSourceManager != null){
-                Globals.virtualAudioSourceManager.createVirtualAudioSource(AssetDataStrings.UI_SFX_INVENTORY_CLOSE, VirtualAudioSourceType.UI, false);
+            if(Globals.audioEngine != null){
+                Globals.audioEngine.virtualAudioSourceManager.createVirtualAudioSource(AssetDataStrings.UI_SFX_INVENTORY_CLOSE, VirtualAudioSourceType.UI, false);
             }
             Globals.renderingEngine.getPostProcessingPipeline().setApplyBlur(false);
             return false;
diff --git a/src/main/java/electrosphere/client/ui/menu/ingame/InventoryMainWindow.java b/src/main/java/electrosphere/client/ui/menu/ingame/InventoryMainWindow.java
index 3a269e09..9f803489 100644
--- a/src/main/java/electrosphere/client/ui/menu/ingame/InventoryMainWindow.java
+++ b/src/main/java/electrosphere/client/ui/menu/ingame/InventoryMainWindow.java
@@ -49,8 +49,8 @@ public class InventoryMainWindow {
                 //controls
                 Globals.controlHandler.hintUpdateControlState(ControlsState.INVENTORY);
                 //play sound effect
-                if(Globals.virtualAudioSourceManager != null){
-                    Globals.virtualAudioSourceManager.createVirtualAudioSource(AssetDataStrings.UI_SFX_INVENTORY_OPEN, VirtualAudioSourceType.UI, false);
+                if(Globals.audioEngine != null){
+                    Globals.audioEngine.virtualAudioSourceManager.createVirtualAudioSource(AssetDataStrings.UI_SFX_INVENTORY_OPEN, VirtualAudioSourceType.UI, false);
                 }
                 Globals.renderingEngine.getPostProcessingPipeline().setApplyBlur(true);
                 //
@@ -59,8 +59,8 @@ public class InventoryMainWindow {
                 Globals.elementService.closeWindow(WindowStrings.WINDOW_CHARACTER);
                 WindowUtils.clearTooltips();
                 Globals.renderingEngine.getPostProcessingPipeline().setApplyBlur(false);
-                if(Globals.virtualAudioSourceManager != null){
-                    Globals.virtualAudioSourceManager.createVirtualAudioSource(AssetDataStrings.UI_SFX_INVENTORY_CLOSE, VirtualAudioSourceType.UI, false);
+                if(Globals.audioEngine != null){
+                    Globals.audioEngine.virtualAudioSourceManager.createVirtualAudioSource(AssetDataStrings.UI_SFX_INVENTORY_CLOSE, VirtualAudioSourceType.UI, false);
                 }
             }
         } else {
@@ -75,8 +75,8 @@ public class InventoryMainWindow {
                 //controls
                 Globals.controlHandler.hintUpdateControlState(ControlsState.INVENTORY);
                 //play sound effect
-                if(Globals.virtualAudioSourceManager != null){
-                    Globals.virtualAudioSourceManager.createVirtualAudioSource(AssetDataStrings.UI_SFX_INVENTORY_OPEN, VirtualAudioSourceType.UI, false);
+                if(Globals.audioEngine != null){
+                    Globals.audioEngine.virtualAudioSourceManager.createVirtualAudioSource(AssetDataStrings.UI_SFX_INVENTORY_OPEN, VirtualAudioSourceType.UI, false);
                 }
                 Globals.renderingEngine.getPostProcessingPipeline().setApplyBlur(true);
                 //
@@ -85,8 +85,8 @@ public class InventoryMainWindow {
                 Globals.elementService.closeWindow(WindowStrings.WINDOW_INVENTORY_TARGET);
                 WindowUtils.clearTooltips();
                 Globals.renderingEngine.getPostProcessingPipeline().setApplyBlur(false);
-                if(Globals.virtualAudioSourceManager != null){
-                    Globals.virtualAudioSourceManager.createVirtualAudioSource(AssetDataStrings.UI_SFX_INVENTORY_CLOSE, VirtualAudioSourceType.UI, false);
+                if(Globals.audioEngine != null){
+                    Globals.audioEngine.virtualAudioSourceManager.createVirtualAudioSource(AssetDataStrings.UI_SFX_INVENTORY_CLOSE, VirtualAudioSourceType.UI, false);
                 }
             }
         }
@@ -131,8 +131,8 @@ public class InventoryMainWindow {
             } else {
                 Globals.controlHandler.hintUpdateControlState(ControlsState.IN_GAME_FREE_CAMERA);
             }
-            if(Globals.virtualAudioSourceManager != null){
-                Globals.virtualAudioSourceManager.createVirtualAudioSource(AssetDataStrings.UI_SFX_INVENTORY_CLOSE, VirtualAudioSourceType.UI, false);
+            if(Globals.audioEngine != null){
+                Globals.audioEngine.virtualAudioSourceManager.createVirtualAudioSource(AssetDataStrings.UI_SFX_INVENTORY_CLOSE, VirtualAudioSourceType.UI, false);
             }
             ItemIconPanel.clearTooltip();
             Globals.renderingEngine.getPostProcessingPipeline().setApplyBlur(false);
diff --git a/src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsInventory.java b/src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsInventory.java
index 80f1656b..b9fdfca1 100644
--- a/src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsInventory.java
+++ b/src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsInventory.java
@@ -27,12 +27,12 @@ public class MenuGeneratorsInventory {
                     //drop item
                     ClientInventoryState.clientAttemptEjectItem(Globals.clientState.playerEntity,Globals.clientState.draggedItem);
                     //play sound effect
-                    if(Globals.virtualAudioSourceManager != null){
+                    if(Globals.audioEngine != null){
                         Item itemData = Globals.gameConfigCurrent.getItemMap().getItem(ItemUtils.getType(Globals.clientState.draggedItem));
                         if(itemData.getItemAudio() != null && itemData.getItemAudio().getUIReleaseAudio() != null){
-                            Globals.virtualAudioSourceManager.createVirtualAudioSource(itemData.getItemAudio().getUIReleaseAudio(), VirtualAudioSourceType.UI, false);
+                            Globals.audioEngine.virtualAudioSourceManager.createVirtualAudioSource(itemData.getItemAudio().getUIReleaseAudio(), VirtualAudioSourceType.UI, false);
                         } else {
-                            Globals.virtualAudioSourceManager.createVirtualAudioSource(AssetDataStrings.UI_SFX_ITEM_RELEASE, VirtualAudioSourceType.UI, false);
+                            Globals.audioEngine.virtualAudioSourceManager.createVirtualAudioSource(AssetDataStrings.UI_SFX_ITEM_RELEASE, VirtualAudioSourceType.UI, false);
                         }
                     }
                     //clear ui
diff --git a/src/main/java/electrosphere/controls/categories/ControlCategoryAlwaysOnDebug.java b/src/main/java/electrosphere/controls/categories/ControlCategoryAlwaysOnDebug.java
index b78eead4..75494774 100644
--- a/src/main/java/electrosphere/controls/categories/ControlCategoryAlwaysOnDebug.java
+++ b/src/main/java/electrosphere/controls/categories/ControlCategoryAlwaysOnDebug.java
@@ -42,8 +42,8 @@ public class ControlCategoryAlwaysOnDebug {
             LoggerInterface.loggerEngine.INFO("open debug menu");
             ImGuiWindowMacros.toggleMainDebugMenu();
             //play sound effect
-            if(Globals.virtualAudioSourceManager != null){
-                Globals.virtualAudioSourceManager.createVirtualAudioSource(AssetDataStrings.UI_TONE_CONFIRM_PRIMARY, VirtualAudioSourceType.UI, false);
+            if(Globals.audioEngine != null){
+                Globals.audioEngine.virtualAudioSourceManager.createVirtualAudioSource(AssetDataStrings.UI_TONE_CONFIRM_PRIMARY, VirtualAudioSourceType.UI, false);
             }
         }});
         controlMap.get(DEBUG_OPEN_DEBUG_MENU).setRepeatTimeout(0.5f * Main.targetFrameRate);
diff --git a/src/main/java/electrosphere/controls/categories/ControlCategoryMainGame.java b/src/main/java/electrosphere/controls/categories/ControlCategoryMainGame.java
index 36fa28bd..6dfac874 100644
--- a/src/main/java/electrosphere/controls/categories/ControlCategoryMainGame.java
+++ b/src/main/java/electrosphere/controls/categories/ControlCategoryMainGame.java
@@ -703,8 +703,8 @@ public class ControlCategoryMainGame {
             Globals.elementService.focusFirstElement();
             Globals.controlHandler.hintUpdateControlState(ControlsState.IN_GAME_MAIN_MENU);
             //play sound effect
-            if(Globals.virtualAudioSourceManager != null){
-                Globals.virtualAudioSourceManager.createVirtualAudioSource(AssetDataStrings.UI_TONE_CONFIRM_PRIMARY, VirtualAudioSourceType.UI, false);
+            if(Globals.audioEngine != null){
+                Globals.audioEngine.virtualAudioSourceManager.createVirtualAudioSource(AssetDataStrings.UI_TONE_CONFIRM_PRIMARY, VirtualAudioSourceType.UI, false);
             }
             Globals.renderingEngine.getPostProcessingPipeline().setApplyBlur(true);
         }});
diff --git a/src/main/java/electrosphere/engine/Globals.java b/src/main/java/electrosphere/engine/Globals.java
index e3506fca..e0f58ceb 100644
--- a/src/main/java/electrosphere/engine/Globals.java
+++ b/src/main/java/electrosphere/engine/Globals.java
@@ -1,9 +1,6 @@
 package electrosphere.engine;
 
 import electrosphere.audio.AudioEngine;
-import electrosphere.audio.VirtualAudioSourceManager;
-import electrosphere.audio.collision.HitboxAudioService;
-import electrosphere.audio.movement.MovementAudioService;
 import electrosphere.auth.AuthenticationManager;
 import electrosphere.client.ClientState;
 import electrosphere.client.block.cells.BlockTextureAtlas;
@@ -81,9 +78,6 @@ public class Globals {
     //Audio Engine
     //
     public static AudioEngine audioEngine;
-    public static VirtualAudioSourceManager virtualAudioSourceManager;
-    public static MovementAudioService movementAudioService;
-    public static HitboxAudioService hitboxAudioService;
     
     
     //
@@ -323,8 +317,6 @@ public class Globals {
         }
         //profiler
         profiler = new Profiler();
-        Globals.movementAudioService = new MovementAudioService();
-        Globals.hitboxAudioService = new HitboxAudioService();
 
 
         //add services here
@@ -380,7 +372,7 @@ public class Globals {
         for(String path : audioToInit){
             Globals.assetManager.addAudioPathToQueue(path);
         }
-        Globals.movementAudioService.init();
+        Globals.audioEngine.movementAudioService.init();
     }
 
     /**
diff --git a/src/main/java/electrosphere/engine/Main.java b/src/main/java/electrosphere/engine/Main.java
index 2ea52110..ea2a6dc5 100644
--- a/src/main/java/electrosphere/engine/Main.java
+++ b/src/main/java/electrosphere/engine/Main.java
@@ -7,7 +7,6 @@ import org.lwjgl.glfw.GLFW;
 import org.ode4j.ode.OdeHelper;
 
 import electrosphere.audio.AudioEngine;
-import electrosphere.audio.VirtualAudioSourceManager;
 import electrosphere.client.ui.menu.debug.ImGuiWindowMacros;
 import electrosphere.controls.ControlHandler;
 import electrosphere.controls.ControlHandler.ControlsState;
@@ -151,7 +150,6 @@ public class Main {
         //create the audio context
         Globals.audioEngine = new AudioEngine();
         if(Globals.RUN_CLIENT && !Globals.HEADLESS && Globals.RUN_AUDIO){
-            Globals.virtualAudioSourceManager = new VirtualAudioSourceManager();
             Globals.audioEngine.init();
             Globals.audioEngine.listAllDevices();
             Globals.initDefaultAudioResources();
@@ -325,9 +323,8 @@ public class Main {
             //     M A I N    A U D I O     F U N C T I O N
             //
             Globals.profiler.beginCpuSample("audio engine update");
-            if(Globals.audioEngine != null && Globals.audioEngine.initialized() && Globals.virtualAudioSourceManager != null){
+            if(Globals.audioEngine != null && Globals.audioEngine.initialized()){
                 Globals.audioEngine.update();
-                Globals.virtualAudioSourceManager.update((float)Globals.engineState.timekeeper.getSimFrameTime());
             }
             Globals.profiler.endCpuSample();
             
diff --git a/src/main/java/electrosphere/entity/btree/StateTransitionUtil.java b/src/main/java/electrosphere/entity/btree/StateTransitionUtil.java
index 2ab7a1e8..87baf563 100644
--- a/src/main/java/electrosphere/entity/btree/StateTransitionUtil.java
+++ b/src/main/java/electrosphere/entity/btree/StateTransitionUtil.java
@@ -155,12 +155,12 @@ public class StateTransitionUtil {
                         //first person
                         //play first person audio
                         if(Globals.audioEngine.initialized() && audioData != null && audioData.getAudioPath() != null){
-                            Globals.virtualAudioSourceManager.createVirtualAudioSource(audioData.getAudioPath(), VirtualAudioSourceType.CREATURE, false);
+                            Globals.audioEngine.virtualAudioSourceManager.createVirtualAudioSource(audioData.getAudioPath(), VirtualAudioSourceType.CREATURE, false);
                         }
                     } else {
                         //play third person audio
                         if(Globals.audioEngine.initialized() && audioData != null && audioData.getAudioPath() != null){
-                            Globals.virtualAudioSourceManager.createVirtualAudioSource(audioData.getAudioPath(), VirtualAudioSourceType.CREATURE, false, EntityUtils.getPosition(parent));
+                            Globals.audioEngine.virtualAudioSourceManager.createVirtualAudioSource(audioData.getAudioPath(), VirtualAudioSourceType.CREATURE, false, EntityUtils.getPosition(parent));
                         }
                     }
 
diff --git a/src/main/java/electrosphere/entity/state/client/ambientaudio/ClientAmbientAudioTree.java b/src/main/java/electrosphere/entity/state/client/ambientaudio/ClientAmbientAudioTree.java
index ce307f18..a2f080aa 100644
--- a/src/main/java/electrosphere/entity/state/client/ambientaudio/ClientAmbientAudioTree.java
+++ b/src/main/java/electrosphere/entity/state/client/ambientaudio/ClientAmbientAudioTree.java
@@ -45,7 +45,7 @@ public class ClientAmbientAudioTree implements BehaviorTree {
     
         if(ambientAudio.getResponseWindAudioFilePath()!=null){
             Globals.assetManager.addAudioPathToQueue(ambientAudio.getResponseWindAudioFilePath());
-            rVal.virtualAudioSource = Globals.virtualAudioSourceManager.createVirtualAudioSource(
+            rVal.virtualAudioSource = Globals.audioEngine.virtualAudioSourceManager.createVirtualAudioSource(
                 ambientAudio.getResponseWindAudioFilePath(),
                 VirtualAudioSourceType.ENVIRONMENT_LONG,
                 ambientAudio.getResponseWindLoops(),
diff --git a/src/main/java/electrosphere/entity/state/inventory/ClientInventoryState.java b/src/main/java/electrosphere/entity/state/inventory/ClientInventoryState.java
index d83f74bd..a46c80d9 100644
--- a/src/main/java/electrosphere/entity/state/inventory/ClientInventoryState.java
+++ b/src/main/java/electrosphere/entity/state/inventory/ClientInventoryState.java
@@ -353,12 +353,12 @@ public class ClientInventoryState implements BehaviorTree {
         //if we're the client, tell the server we want to try the transform
         NetworkMessage requestPickupMessage = InventoryMessage.constructremoveItemFromInventoryMessage(Globals.clientState.clientSceneWrapper.mapClientToServerId(item.getId()));
         Globals.clientState.clientConnection.queueOutgoingMessage(requestPickupMessage);
-        if(Globals.virtualAudioSourceManager != null){
+        if(Globals.audioEngine != null){
             Item itemData = Globals.gameConfigCurrent.getItemMap().getItem(ItemUtils.getType(item));
             if(itemData != null && itemData.getItemAudio() != null && itemData.getItemAudio().getUIReleaseAudio() != null){
-                Globals.virtualAudioSourceManager.createVirtualAudioSource(itemData.getItemAudio().getUIReleaseAudio(), VirtualAudioSourceType.UI, false);
+                Globals.audioEngine.virtualAudioSourceManager.createVirtualAudioSource(itemData.getItemAudio().getUIReleaseAudio(), VirtualAudioSourceType.UI, false);
             } else {
-                Globals.virtualAudioSourceManager.createVirtualAudioSource(AssetDataStrings.UI_SFX_ITEM_RELEASE, VirtualAudioSourceType.UI, false);
+                Globals.audioEngine.virtualAudioSourceManager.createVirtualAudioSource(AssetDataStrings.UI_SFX_ITEM_RELEASE, VirtualAudioSourceType.UI, false);
             }
         }
     }
diff --git a/src/main/java/electrosphere/entity/state/movement/fall/ClientFallTree.java b/src/main/java/electrosphere/entity/state/movement/fall/ClientFallTree.java
index 41886bbf..f54415d0 100644
--- a/src/main/java/electrosphere/entity/state/movement/fall/ClientFallTree.java
+++ b/src/main/java/electrosphere/entity/state/movement/fall/ClientFallTree.java
@@ -141,11 +141,11 @@ public class ClientFallTree implements BehaviorTree {
                 }
                 if(parent == Globals.clientState.playerEntity && !Globals.controlHandler.cameraIsThirdPerson()){
                     //first person
-                    Globals.movementAudioService.playAudioPositional(ClientVoxelSampler.getVoxelTypeBeneathEntity(parent), InteractionType.LAND, EntityUtils.getPosition(parent));
+                    Globals.audioEngine.movementAudioService.playAudioPositional(ClientVoxelSampler.getVoxelTypeBeneathEntity(parent), InteractionType.LAND, EntityUtils.getPosition(parent));
                     //play first person audio
                 } else {
                     //play third person audio
-                    Globals.movementAudioService.playAudioPositional(ClientVoxelSampler.getVoxelTypeBeneathEntity(parent), InteractionType.LAND, EntityUtils.getPosition(parent));
+                    Globals.audioEngine.movementAudioService.playAudioPositional(ClientVoxelSampler.getVoxelTypeBeneathEntity(parent), InteractionType.LAND, EntityUtils.getPosition(parent));
                 }
             }
             frameCurrent = 0;
diff --git a/src/main/java/electrosphere/entity/state/movement/groundmove/ClientGroundMovementTree.java b/src/main/java/electrosphere/entity/state/movement/groundmove/ClientGroundMovementTree.java
index 0bd353fa..39601dc8 100644
--- a/src/main/java/electrosphere/entity/state/movement/groundmove/ClientGroundMovementTree.java
+++ b/src/main/java/electrosphere/entity/state/movement/groundmove/ClientGroundMovementTree.java
@@ -543,9 +543,9 @@ public class ClientGroundMovementTree implements BehaviorTree {
         ){
             this.playedFootstepFirst = true;
             if(parent == Globals.clientState.playerEntity && !Globals.controlHandler.cameraIsThirdPerson()){
-                Globals.movementAudioService.playAudioPositional(ClientVoxelSampler.getVoxelTypeBeneathEntity(parent), InteractionType.STEP_BARE_REG, position);
+                Globals.audioEngine.movementAudioService.playAudioPositional(ClientVoxelSampler.getVoxelTypeBeneathEntity(parent), InteractionType.STEP_BARE_REG, position);
             } else {
-                Globals.movementAudioService.playAudioPositional(ClientVoxelSampler.getVoxelTypeBeneathEntity(parent), InteractionType.STEP_BARE_REG, position);
+                Globals.audioEngine.movementAudioService.playAudioPositional(ClientVoxelSampler.getVoxelTypeBeneathEntity(parent), InteractionType.STEP_BARE_REG, position);
             }
         }
         if(
@@ -556,9 +556,9 @@ public class ClientGroundMovementTree implements BehaviorTree {
         ){
             this.playedFootstepSecond = true;
             if(parent == Globals.clientState.playerEntity && !Globals.controlHandler.cameraIsThirdPerson()){
-                Globals.movementAudioService.playAudioPositional(ClientVoxelSampler.getVoxelTypeBeneathEntity(parent), InteractionType.STEP_BARE_REG, position);
+                Globals.audioEngine.movementAudioService.playAudioPositional(ClientVoxelSampler.getVoxelTypeBeneathEntity(parent), InteractionType.STEP_BARE_REG, position);
             } else {
-                Globals.movementAudioService.playAudioPositional(ClientVoxelSampler.getVoxelTypeBeneathEntity(parent), InteractionType.STEP_BARE_REG, position);
+                Globals.audioEngine.movementAudioService.playAudioPositional(ClientVoxelSampler.getVoxelTypeBeneathEntity(parent), InteractionType.STEP_BARE_REG, position);
             }
         }
         if(firstOffset == null || secondOffset == null){
diff --git a/src/main/java/electrosphere/entity/state/movement/jump/ClientJumpTree.java b/src/main/java/electrosphere/entity/state/movement/jump/ClientJumpTree.java
index b1a8b5e4..d6765bf7 100644
--- a/src/main/java/electrosphere/entity/state/movement/jump/ClientJumpTree.java
+++ b/src/main/java/electrosphere/entity/state/movement/jump/ClientJumpTree.java
@@ -323,9 +323,9 @@ public class ClientJumpTree implements BehaviorTree {
             } break;
             case ACTIVE: {
                 if(parent == Globals.clientState.playerEntity && !Globals.controlHandler.cameraIsThirdPerson()){
-                    Globals.movementAudioService.playAudioPositional(ClientVoxelSampler.getVoxelTypeBeneathEntity(parent), InteractionType.JUMP, EntityUtils.getPosition(parent));
+                    Globals.audioEngine.movementAudioService.playAudioPositional(ClientVoxelSampler.getVoxelTypeBeneathEntity(parent), InteractionType.JUMP, EntityUtils.getPosition(parent));
                 } else {
-                    Globals.movementAudioService.playAudioPositional(ClientVoxelSampler.getVoxelTypeBeneathEntity(parent), InteractionType.JUMP, EntityUtils.getPosition(parent));
+                    Globals.audioEngine.movementAudioService.playAudioPositional(ClientVoxelSampler.getVoxelTypeBeneathEntity(parent), InteractionType.JUMP, EntityUtils.getPosition(parent));
                 }
             } break;
             case AWAITING_LAND: {
diff --git a/src/main/java/electrosphere/renderer/ui/elements/Button.java b/src/main/java/electrosphere/renderer/ui/elements/Button.java
index ee04820a..e0dd7ac1 100644
--- a/src/main/java/electrosphere/renderer/ui/elements/Button.java
+++ b/src/main/java/electrosphere/renderer/ui/elements/Button.java
@@ -136,8 +136,8 @@ public class Button extends StandardContainerElement implements DrawableElement,
         rVal.addChild(rValLabel);
         rVal.setOnClick(new ClickableElement.ClickEventCallback(){public boolean execute(ClickEvent event){
             callback.run();
-            if(Globals.virtualAudioSourceManager != null && rVal.audioPathOnClick != null){
-                Globals.virtualAudioSourceManager.createUI(rVal.audioPathOnClick);
+            if(Globals.audioEngine.virtualAudioSourceManager != null && rVal.audioPathOnClick != null){
+                Globals.audioEngine.virtualAudioSourceManager.createUI(rVal.audioPathOnClick);
             }
             return false;
         }});
@@ -163,8 +163,8 @@ public class Button extends StandardContainerElement implements DrawableElement,
         rVal.addChild(rValLabel);
         rVal.setOnClick(new ClickableElement.ClickEventCallback(){public boolean execute(ClickEvent event){
             callback.run();
-            if(Globals.virtualAudioSourceManager != null && rVal.audioPathOnClick != null){
-                Globals.virtualAudioSourceManager.createUI(rVal.audioPathOnClick);
+            if(Globals.audioEngine.virtualAudioSourceManager != null && rVal.audioPathOnClick != null){
+                Globals.audioEngine.virtualAudioSourceManager.createUI(rVal.audioPathOnClick);
             }
             return false;
         }});
@@ -191,8 +191,8 @@ public class Button extends StandardContainerElement implements DrawableElement,
         rVal.addChild(rValLabel);
         rVal.setOnClick(new ClickableElement.ClickEventCallback(){public boolean execute(ClickEvent event){
             callback.run();
-            if(Globals.virtualAudioSourceManager != null && rVal.audioPathOnClick != null){
-                Globals.virtualAudioSourceManager.createUI(rVal.audioPathOnClick);
+            if(Globals.audioEngine.virtualAudioSourceManager != null && rVal.audioPathOnClick != null){
+                Globals.audioEngine.virtualAudioSourceManager.createUI(rVal.audioPathOnClick);
             }
             return false;
         }});
@@ -213,8 +213,8 @@ public class Button extends StandardContainerElement implements DrawableElement,
         rVal.setPaddingBottom(DEFAULT_PADDING);
         rVal.setOnClick(new ClickableElement.ClickEventCallback(){public boolean execute(ClickEvent event){
             callback.run();
-            if(Globals.virtualAudioSourceManager != null && rVal.audioPathOnClick != null){
-                Globals.virtualAudioSourceManager.createUI(rVal.audioPathOnClick);
+            if(Globals.audioEngine != null && rVal.audioPathOnClick != null){
+                Globals.audioEngine.virtualAudioSourceManager.createUI(rVal.audioPathOnClick);
             }
             return false;
         }});
diff --git a/src/main/java/electrosphere/renderer/ui/elements/TextInput.java b/src/main/java/electrosphere/renderer/ui/elements/TextInput.java
index 0db451c4..56f56362 100644
--- a/src/main/java/electrosphere/renderer/ui/elements/TextInput.java
+++ b/src/main/java/electrosphere/renderer/ui/elements/TextInput.java
@@ -280,19 +280,19 @@ public class TextInput extends StandardContainerElement implements DrawableEleme
         if(keyEvent.getKey().matches(Pattern.quote("bs"))){
             if(this.text.length() > 0){
                 this.setText(this.text.substring(0, this.text.length() - 1));
-                if(Globals.virtualAudioSourceManager != null && this.audioPathOnType != null){
-                    Globals.virtualAudioSourceManager.createUI(this.audioPathOnType);
+                if(Globals.audioEngine != null && this.audioPathOnType != null){
+                    Globals.audioEngine.virtualAudioSourceManager.createUI(this.audioPathOnType);
                 }
             } else {
-                if(Globals.virtualAudioSourceManager != null && this.audioPathOnTypeError != null){
-                    Globals.virtualAudioSourceManager.createUI(this.audioPathOnTypeError);
+                if(Globals.audioEngine != null && this.audioPathOnTypeError != null){
+                    Globals.audioEngine.virtualAudioSourceManager.createUI(this.audioPathOnTypeError);
                 }
             }
         } else {
             String newVal = this.text + keyEvent.getKey();
             this.setText(newVal);
-            if(Globals.virtualAudioSourceManager != null && this.audioPathOnType != null){
-                Globals.virtualAudioSourceManager.createUI(this.audioPathOnType);
+            if(Globals.audioEngine != null && this.audioPathOnType != null){
+                Globals.audioEngine.virtualAudioSourceManager.createUI(this.audioPathOnType);
             }
         }
         //apply yoga at the window level