diff --git a/CMakeLists.txt b/CMakeLists.txt
index da93e28..dff25bb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,7 +24,6 @@ add_library( # Sets the name of the library.
              SHARED
 
              # Provides a relative path to your source file(s).
-            src/main.cpp
             src/ProcessUnit_FX.cpp
             ${EFFECTS}
             ${UTIL} src/data.h)
diff --git a/src/ProcessUnit_FX.cpp b/src/ProcessUnit_FX.cpp
index 0a2af61..6f46663 100644
--- a/src/ProcessUnit_FX.cpp
+++ b/src/ProcessUnit_FX.cpp
@@ -31,18 +31,14 @@ ProcessUnit_FX::ProcessUnit_FX() {
     float fVar4;
     float extraout_s0;
 
-    Effect::Effect((Effect *)this);
-    this->field_0x0 = &PTR_command_000d0cf8;
+    Effect::Effect((Effect *)this);  // Parent class?
+    this->field_0x0 = &PTR_command_000d0cf8;  // ?
     __android_log_print(4,"ViPER4Android_v2","Welcome to ViPER4Android driver[SQ]");
     __android_log_print(4,"ViPER4Android_v2","Current version is %d.%d.%d.%d %s",2,5,0,4,"Beautiful");
     this->field_0x68 = (undefined *)this;
     this->field_0x88 = 0;
-    this_00 = (AdaptiveBuffer_FPI32 *)operator_new(0x20);
-    this_00 = new AdaptiveBuffer_FPI32(2,0x1000);
-    this->floatIntBuffer = this_00;
-    this_01 = (WaveBuffer_R32 *)operator_new(0x20);
-    WaveBuffer_R32::WaveBuffer_R32(this_01,2,0x1000);
-    this->waveBuffer = this_01;
+    this->floatIntBuffer = new AdaptiveBuffer_FPI32(2,0x1000);
+    this->waveBuffer = new WaveBuffer_R32(2,0x1000);
     this_02 = (Convolver *)operator_new(0x174);
     Convolver::Convolver(this_02);
     this->convolver = this_02;
diff --git a/src/ProcessUnit_FX.h b/src/ProcessUnit_FX.h
index 312d67d..af1767d 100644
--- a/src/ProcessUnit_FX.h
+++ b/src/ProcessUnit_FX.h
@@ -5,8 +5,28 @@
 #ifndef VIPER_PROCESSUNIT_FX_H
 #define VIPER_PROCESSUNIT_FX_H
 
-
-#include "main.h"
+#include "effects/Effect.h"
+#include "data.h"
+#include "util/AdaptiveBuffer_FPI32.h"
+#include "util/WaveBuffer_R32.h"
+#include "effects/ViPERDDC.h"
+#include "effects/Convolver.h"
+#include "effects/VHE.h"
+#include "effects/SpectrumExtend.h"
+#include "effects/IIRFilter.h"
+#include "effects/ColorfulMusic.h"
+#include "effects/Reverberation.h"
+#include "effects/PlaybackGain.h"
+#include "effects/FETCompressor.h"
+#include "effects/DynamicSystem.h"
+#include "effects/ViPERBass.h"
+#include "effects/ViPERClarity.h"
+#include "effects/DiffSurround.h"
+#include "effects/Cure.h"
+#include "effects/TubeSimulator.h"
+#include "effects/AnalogX.h"
+#include "effects/SpeakerCorrection.h"
+#include "util/SoftwareLimiter.h"
 
 class ProcessUnit_FX {
 public:
@@ -101,23 +121,23 @@ public:
     AdaptiveBuffer_FPI32 * floatIntBuffer;
     WaveBuffer_R32 * waveBuffer;
     undefined4 field_0x88;
-    Convolver;
-    VHE;
+    Convolver * convolver;
+    VHE * vhe;
     ViPERDDC * vddc;
-    SpectrumExtend;
-    IIRFilter;
+    SpectrumExtend * spectrumExtend;
+    IIRFilter * iirFilter;
     ColorfulMusic colorful;
     Reverberation * reverb;
-    PlaybackGain;
-    FETCompressor;
-    DynamicSystem;
+    PlaybackGain * playbackGain;
+    FETCompressor * fetCompressor;
+    DynamicSystem * dynamicSystem;
     ViPERBass * vbass;
     ViPERClarity * vclarity;
-    DiffSurround;
-    Cure;
+    DiffSurround * diffSurround;
+    Cure * cure;
     TubeSimulator * tubeSim;
-    AnalogX;
-    SpeakerCorrection;
+    AnalogX * analogx;
+    SpeakerCorrection * speakerCorrection;
     SoftwareLimiter * softLimit1;
     SoftwareLimiter * softLimit2;
     undefined4 field_0xd8;
diff --git a/src/effects/ColorfulMusic.h b/src/effects/ColorfulMusic.h
index 1f9e27e..ea3a52a 100644
--- a/src/effects/ColorfulMusic.h
+++ b/src/effects/ColorfulMusic.h
@@ -6,7 +6,7 @@
 #define VIPER_COLORFULMUSIC_H
 
 
-#include "Stereo3DSurround.h"
+#include "../util/Stereo3DSurround.h"
 
 class ColorfulMusic {
     undefined field_0x0;
diff --git a/src/effects/DepthSurround.h b/src/effects/DepthSurround.h
index 46955e2..e13bd08 100644
--- a/src/effects/DepthSurround.h
+++ b/src/effects/DepthSurround.h
@@ -6,7 +6,7 @@
 #define VIPER_DEPTHSURROUND_H
 
 
-#include "Stereo3DSurround.h"
+#include "../util/Stereo3DSurround.h"
 
 class DepthSurround {
     short field_0x0;
diff --git a/src/util/IIRFilter.cpp b/src/effects/IIRFilter.cpp
similarity index 100%
rename from src/util/IIRFilter.cpp
rename to src/effects/IIRFilter.cpp
diff --git a/src/util/IIRFilter.h b/src/effects/IIRFilter.h
similarity index 100%
rename from src/util/IIRFilter.h
rename to src/effects/IIRFilter.h
diff --git a/src/main.h b/src/main.h
index 09bce0d..8646159 100644
--- a/src/main.h
+++ b/src/main.h
@@ -5,6 +5,8 @@
 #include "util/misc.h"
 #include "ProcessUnit_FX.h"
 
+// We don't really care about this file, it's just compat with android API
+
 typedef struct intf {
     int32_t (*process)(effect_handle_t self,
                        audio_buffer_t *inBuffer,
diff --git a/src/effects/Stereo3DSurround.cpp b/src/util/Stereo3DSurround.cpp
similarity index 100%
rename from src/effects/Stereo3DSurround.cpp
rename to src/util/Stereo3DSurround.cpp
diff --git a/src/effects/Stereo3DSurround.h b/src/util/Stereo3DSurround.h
similarity index 100%
rename from src/effects/Stereo3DSurround.h
rename to src/util/Stereo3DSurround.h
diff --git a/src/effects/Subwoofer.cpp b/src/util/Subwoofer.cpp
similarity index 100%
rename from src/effects/Subwoofer.cpp
rename to src/util/Subwoofer.cpp
diff --git a/src/effects/Subwoofer.h b/src/util/Subwoofer.h
similarity index 100%
rename from src/effects/Subwoofer.h
rename to src/util/Subwoofer.h