diff --git a/pcsx2/Sio.cpp b/pcsx2/Sio.cpp
index ce00dd2b18..581416c4b2 100644
--- a/pcsx2/Sio.cpp
+++ b/pcsx2/Sio.cpp
@@ -23,8 +23,6 @@
 
 #ifndef DISABLE_RECORDING
 #	include "Recording/InputRecording.h"
-#	include "Recording/PadData.h"
-#	include "Recording/RecordingInputManager.h"
 #endif
 
 _sio sio;
@@ -214,7 +212,6 @@ SIO_WRITE sioWriteController(u8 data)
 
 	default:
 		sio.buf[sio.bufCount] = PADpoll(data);
-
 #ifndef DISABLE_RECORDING
 		if (g_Conf->EmuOptions.EnableRecordingTools)
 		{
@@ -222,12 +219,6 @@ SIO_WRITE sioWriteController(u8 data)
 			if (sio.slot[sio.port] == 0)
 			{
 				g_InputRecording.ControllerInterrupt(data, sio.port, sio.bufCount, sio.buf);
-				if (g_InputRecording.IsInterruptFrame())
-				{
-					g_RecordingInput.ControllerInterrupt(data, sio.port, sio.bufCount, sio.buf);
-				}
-
-				PadData::LogPadData(sio.port, sio.bufCount, sio.buf);
 			}
 		}
 #endif
diff --git a/pcsx2/gui/App.h b/pcsx2/gui/App.h
index fcc61b20e2..e24bae5cd6 100644
--- a/pcsx2/gui/App.h
+++ b/pcsx2/gui/App.h
@@ -29,7 +29,7 @@
 #include "DriveList.h"
 
 #ifndef DISABLE_RECORDING
-#	include "Recording/VirtualPad.h"
+#	include "Recording/VirtualPad/VirtualPad.h"
 #	include "Recording/NewRecordingFrame.h"
 #endif
 
diff --git a/pcsx2/gui/AppInit.cpp b/pcsx2/gui/AppInit.cpp
index d161d51820..0a2c53eed7 100644
--- a/pcsx2/gui/AppInit.cpp
+++ b/pcsx2/gui/AppInit.cpp
@@ -27,7 +27,8 @@
 #include "Debugger/DisassemblyDialog.h"
 
 #ifndef DISABLE_RECORDING
-#	include "Recording/VirtualPad.h"
+#   include "Recording/InputRecording.h"
+#	include "Recording/VirtualPad/VirtualPad.h"
 #endif
 
 #include <wx/cmdline.h>
@@ -78,9 +79,11 @@ void Pcsx2App::OpenMainFrame()
 
 #ifndef DISABLE_RECORDING
 	VirtualPad* virtualPad0 = new VirtualPad(mainFrame, wxID_ANY, wxEmptyString, 0);
+	g_inputRecording.setVirtualPadPtr(virtualPad0, 0);
 	m_id_VirtualPad[0] = virtualPad0->GetId();
-
-	VirtualPad* virtualPad1 = new VirtualPad(mainFrame, wxID_ANY, wxEmptyString, 1);
+	
+	VirtualPad *virtualPad1 = new VirtualPad(mainFrame, wxID_ANY, wxEmptyString, 1);
+    g_inputRecording.setVirtualPadPtr(virtualPad1, 1);
 	m_id_VirtualPad[1] = virtualPad1->GetId();
 
 	NewRecordingFrame* newRecordingFrame = new NewRecordingFrame(mainFrame);
diff --git a/pcsx2/gui/MainMenuClicks.cpp b/pcsx2/gui/MainMenuClicks.cpp
index 21c7996131..86bf4cb582 100644
--- a/pcsx2/gui/MainMenuClicks.cpp
+++ b/pcsx2/gui/MainMenuClicks.cpp
@@ -33,7 +33,7 @@
 #ifndef DISABLE_RECORDING
 #	include "Recording/InputRecording.h"
 #	include "Recording/InputRecordingControls.h"
-#	include "Recording/VirtualPad.h"
+#	include "Recording/VirtualPad/VirtualPad.h"
 #endif