diff --git a/src/classic.c b/src/main/c/classic.c
similarity index 100%
rename from src/classic.c
rename to src/main/c/classic.c
diff --git a/src/dynamics.c b/src/main/c/dynamics.c
similarity index 100%
rename from src/dynamics.c
rename to src/main/c/dynamics.c
diff --git a/src/events.c b/src/main/c/events.c
similarity index 100%
rename from src/events.c
rename to src/main/c/events.c
diff --git a/src/guitar_hero_3.c b/src/main/c/guitar_hero_3.c
similarity index 100%
rename from src/guitar_hero_3.c
rename to src/main/c/guitar_hero_3.c
diff --git a/src/io.c b/src/main/c/io.c
similarity index 100%
rename from src/io.c
rename to src/main/c/io.c
diff --git a/src/ir.c b/src/main/c/ir.c
similarity index 100%
rename from src/ir.c
rename to src/main/c/ir.c
diff --git a/src/motion_plus.c b/src/main/c/motion_plus.c
similarity index 100%
rename from src/motion_plus.c
rename to src/main/c/motion_plus.c
diff --git a/src/nunchuk.c b/src/main/c/nunchuk.c
similarity index 100%
rename from src/nunchuk.c
rename to src/main/c/nunchuk.c
diff --git a/src/os_mac/os_mac.h b/src/main/c/os_mac/os_mac.h
similarity index 100%
rename from src/os_mac/os_mac.h
rename to src/main/c/os_mac/os_mac.h
diff --git a/src/os_mac/os_mac.m b/src/main/c/os_mac/os_mac.m
similarity index 100%
rename from src/os_mac/os_mac.m
rename to src/main/c/os_mac/os_mac.m
diff --git a/src/os_mac/os_mac_find.m b/src/main/c/os_mac/os_mac_find.m
similarity index 100%
rename from src/os_mac/os_mac_find.m
rename to src/main/c/os_mac/os_mac_find.m
diff --git a/src/os_mac/os_mac_interface.m b/src/main/c/os_mac/os_mac_interface.m
similarity index 100%
rename from src/os_mac/os_mac_interface.m
rename to src/main/c/os_mac/os_mac_interface.m
diff --git a/src/os_nix.c b/src/main/c/os_nix.c
similarity index 100%
rename from src/os_nix.c
rename to src/main/c/os_nix.c
diff --git a/src/os_win.c b/src/main/c/os_win.c
similarity index 99%
rename from src/os_win.c
rename to src/main/c/os_win.c
index c0f0010..5339028 100644
--- a/src/os_win.c
+++ b/src/main/c/os_win.c
@@ -48,12 +48,13 @@
 #	ifdef __cplusplus
 extern "C" {
 #	endif
-	WINHIDSDI BOOL WINAPI HidD_SetOutputReport(HANDLE, PVOID, ULONG);
+	WIIUSE_EXPORT BOOL WINAPI HidD_SetOutputReport(HANDLE, PVOID, ULONG);
 #	ifdef __cplusplus
 }
 #	endif
 #endif
 
+
 int wiiuse_os_find(struct wiimote_t** wm, int max_wiimotes, int timeout) {
 	GUID device_id;
 	HANDLE dev;
diff --git a/src/util.c b/src/main/c/util.c
similarity index 100%
rename from src/util.c
rename to src/main/c/util.c
diff --git a/src/wiiboard.c b/src/main/c/wiiboard.c
similarity index 100%
rename from src/wiiboard.c
rename to src/main/c/wiiboard.c
diff --git a/src/wiiuse.c b/src/main/c/wiiuse.c
similarity index 100%
rename from src/wiiuse.c
rename to src/main/c/wiiuse.c
diff --git a/src/classic.h b/src/main/headers/classic.h
similarity index 100%
rename from src/classic.h
rename to src/main/headers/classic.h
diff --git a/src/definitions.h b/src/main/headers/definitions.h
similarity index 100%
rename from src/definitions.h
rename to src/main/headers/definitions.h
diff --git a/src/definitions_os.h b/src/main/headers/definitions_os.h
similarity index 100%
rename from src/definitions_os.h
rename to src/main/headers/definitions_os.h
diff --git a/src/dynamics.h b/src/main/headers/dynamics.h
similarity index 100%
rename from src/dynamics.h
rename to src/main/headers/dynamics.h
diff --git a/src/events.h b/src/main/headers/events.h
similarity index 100%
rename from src/events.h
rename to src/main/headers/events.h
diff --git a/src/guitar_hero_3.h b/src/main/headers/guitar_hero_3.h
similarity index 100%
rename from src/guitar_hero_3.h
rename to src/main/headers/guitar_hero_3.h
diff --git a/src/io.h b/src/main/headers/io.h
similarity index 100%
rename from src/io.h
rename to src/main/headers/io.h
diff --git a/src/ir.h b/src/main/headers/ir.h
similarity index 100%
rename from src/ir.h
rename to src/main/headers/ir.h
diff --git a/src/motion_plus.h b/src/main/headers/motion_plus.h
similarity index 100%
rename from src/motion_plus.h
rename to src/main/headers/motion_plus.h
diff --git a/src/nunchuk.h b/src/main/headers/nunchuk.h
similarity index 100%
rename from src/nunchuk.h
rename to src/main/headers/nunchuk.h
diff --git a/src/os.h b/src/main/headers/os.h
similarity index 100%
rename from src/os.h
rename to src/main/headers/os.h
diff --git a/src/wiiboard.h b/src/main/headers/wiiboard.h
similarity index 100%
rename from src/wiiboard.h
rename to src/main/headers/wiiboard.h
diff --git a/src/wiiuse.h b/src/main/headers/wiiuse.h
similarity index 100%
rename from src/wiiuse.h
rename to src/main/headers/wiiuse.h
diff --git a/src/wiiuse_internal.h b/src/main/headers/wiiuse_internal.h
similarity index 100%
rename from src/wiiuse_internal.h
rename to src/main/headers/wiiuse_internal.h
diff --git a/src/wiiuse_msvcstdint.h b/src/main/headers/wiiuse_msvcstdint.h
similarity index 100%
rename from src/wiiuse_msvcstdint.h
rename to src/main/headers/wiiuse_msvcstdint.h