diff --git a/v1/Combined Example.ahk b/AHK v1/Combined Example.ahk
similarity index 100%
rename from v1/Combined Example.ahk
rename to AHK v1/Combined Example.ahk
diff --git a/v1/Context Example.ahk b/AHK v1/Context Example.ahk
similarity index 100%
rename from v1/Context Example.ahk
rename to AHK v1/Context Example.ahk
diff --git a/v1/Development Tools/AhiScanCodeTester.ahk b/AHK v1/Development Tools/AhiScanCodeTester.ahk
similarity index 100%
rename from v1/Development Tools/AhiScanCodeTester.ahk
rename to AHK v1/Development Tools/AhiScanCodeTester.ahk
diff --git a/v1/Development Tools/AhkScanCodeTester.ahk b/AHK v1/Development Tools/AhkScanCodeTester.ahk
similarity index 100%
rename from v1/Development Tools/AhkScanCodeTester.ahk
rename to AHK v1/Development Tools/AhkScanCodeTester.ahk
diff --git a/v1/Lib/AutoHotInterception.ahk b/AHK v1/Lib/AutoHotInterception.ahk
similarity index 100%
rename from v1/Lib/AutoHotInterception.ahk
rename to AHK v1/Lib/AutoHotInterception.ahk
diff --git a/v1/Lib/CLR.ahk b/AHK v1/Lib/CLR.ahk
similarity index 100%
rename from v1/Lib/CLR.ahk
rename to AHK v1/Lib/CLR.ahk
diff --git a/v1/Lib/Unblocker.ps1 b/AHK v1/Lib/Unblocker.ps1
similarity index 100%
rename from v1/Lib/Unblocker.ps1
rename to AHK v1/Lib/Unblocker.ps1
diff --git a/v1/Monitor.ahk b/AHK v1/Monitor.ahk
similarity index 100%
rename from v1/Monitor.ahk
rename to AHK v1/Monitor.ahk
diff --git a/AHK v1/Monitor.exe b/AHK v1/Monitor.exe
new file mode 100644
index 0000000..194d982
Binary files /dev/null and b/AHK v1/Monitor.exe differ
diff --git a/v1/RollMouse.ahk b/AHK v1/RollMouse.ahk
similarity index 100%
rename from v1/RollMouse.ahk
rename to AHK v1/RollMouse.ahk
diff --git a/v1/SubscribeAbsolute dragging example.ahk b/AHK v1/SubscribeAbsolute dragging example.ahk
similarity index 100%
rename from v1/SubscribeAbsolute dragging example.ahk
rename to AHK v1/SubscribeAbsolute dragging example.ahk
diff --git a/v1/SubscribeAbsolute example.ahk b/AHK v1/SubscribeAbsolute example.ahk
similarity index 100%
rename from v1/SubscribeAbsolute example.ahk
rename to AHK v1/SubscribeAbsolute example.ahk
diff --git a/v1/SubscribeAll Example.ahk b/AHK v1/SubscribeAll Example.ahk
similarity index 100%
rename from v1/SubscribeAll Example.ahk
rename to AHK v1/SubscribeAll Example.ahk
diff --git a/v1/Subscription Example.ahk b/AHK v1/Subscription Example.ahk
similarity index 100%
rename from v1/Subscription Example.ahk
rename to AHK v1/Subscription Example.ahk
diff --git a/v1/TabletButtonBuilder.ahk b/AHK v1/TabletButtonBuilder.ahk
similarity index 100%
rename from v1/TabletButtonBuilder.ahk
rename to AHK v1/TabletButtonBuilder.ahk
diff --git a/v1/TabletButtons.ahk b/AHK v1/TabletButtons.ahk
similarity index 100%
rename from v1/TabletButtons.ahk
rename to AHK v1/TabletButtons.ahk
diff --git a/v1/TabletLib/JSON.ahk b/AHK v1/TabletLib/JSON.ahk
similarity index 100%
rename from v1/TabletLib/JSON.ahk
rename to AHK v1/TabletLib/JSON.ahk
diff --git a/v1/TabletLib/TabletLib.ahk b/AHK v1/TabletLib/TabletLib.ahk
similarity index 100%
rename from v1/TabletLib/TabletLib.ahk
rename to AHK v1/TabletLib/TabletLib.ahk
diff --git a/v1/Unsubscription Example.ahk b/AHK v1/Unsubscription Example.ahk
similarity index 100%
rename from v1/Unsubscription Example.ahk
rename to AHK v1/Unsubscription Example.ahk
diff --git a/v2/Context Example.ahk b/AHK v2/Context Example.ahk
similarity index 100%
rename from v2/Context Example.ahk
rename to AHK v2/Context Example.ahk
diff --git a/v2/Lib/AutoHotInterception.ahk b/AHK v2/Lib/AutoHotInterception.ahk
similarity index 100%
rename from v2/Lib/AutoHotInterception.ahk
rename to AHK v2/Lib/AutoHotInterception.ahk
diff --git a/v2/Lib/CLR.ahk b/AHK v2/Lib/CLR.ahk
similarity index 100%
rename from v2/Lib/CLR.ahk
rename to AHK v2/Lib/CLR.ahk
diff --git a/v2/Monitor.ahk b/AHK v2/Monitor.ahk
similarity index 100%
rename from v2/Monitor.ahk
rename to AHK v2/Monitor.ahk
diff --git a/v2/SubscribeAll Example.ahk b/AHK v2/SubscribeAll Example.ahk
similarity index 100%
rename from v2/SubscribeAll Example.ahk
rename to AHK v2/SubscribeAll Example.ahk
diff --git a/v2/Subscription Example.ahk b/AHK v2/Subscription Example.ahk
similarity index 100%
rename from v2/Subscription Example.ahk
rename to AHK v2/Subscription Example.ahk
diff --git a/AHK v2/test.ahk b/AHK v2/test.ahk
new file mode 100644
index 0000000..8c11a42
--- /dev/null
+++ b/AHK v2/test.ahk	
@@ -0,0 +1,61 @@
+#Include Lib\AutoHotInterception.ahk
+
+AHI := AutoHotInterception()
+enabled := true
+; Wooting Two: HID\VID_03EB&PID_FF02&REV_0090&MI_03
+; G604: 0x046D, 0xC539
+; keyboardId := AHI.GetKeyboardIdFromHandle("HID\VID_03EB&PID_FF02&REV_0090&MI_03")
+;mouseId := AHI.GetMouseId(0x046D, 0xC539)
+keyboardId := AHI.GetKeyboardId(0x04F2, 0x0112)
+
+; AHI.SubscribeKey(keyboardId, GetKeySC("a"), false, KbSubscribeTest)
+; AHI.SubscribeKeyboard(keyboardId, false, KbSubscribeAllTest)
+; l := AHI.GetDeviceList()
+; AHI.SubscribeMouseButton(mouseId, 1, false, MBSubscribeTest)
+; AHI.SubscribeMouseMove(mouseId, false, MASubscribeTest)
+
+cm1 := AHI.CreateContextManager(keyboardId)
+return
+
+KbSubscribeTest(state){
+    global AHI, keyboardId
+    ToolTip("KBSubscribe`nState: " state)
+    AHI.SendKeyEvent(keyboardId, GetKeySC("b"), state)
+}
+
+KbSubscribeAllTest(code, state){
+    ToolTip("KbSubscribeAll`ncode: " code "`nstate: " state)
+}
+
+MBSubscribeTest(state){
+    ToolTip("MBSubscribe`nstate: " state)
+}
+
+MASubscribeTest(x, y){
+    ToolTip("MASubscribe`nx: " x "`ny: " y)
+}
+
+x::
+{
+    global enabled
+    enabled := !enabled
+    AHI.SetState(enabled)
+}
+
+#HotIf cm1.IsActive
+::aaa::JACKPOT
+1::
+{
+	ToolTip("KEY DOWN EVENT @ " A_TickCount)
+	return
+}
+
+1 up::
+{
+	ToolTip("KEY UP EVENT @ " A_TickCount)
+	return
+}
+#HotIf
+
+
+^Esc::ExitApp
\ No newline at end of file