diff --git a/ultralight/cgo_helpers.go b/ultralight/cgo_helpers.go
index 03c3254..db5e2f6 100644
--- a/ultralight/cgo_helpers.go
+++ b/ultralight/cgo_helpers.go
@@ -7,7 +7,11 @@ package ultralight
 
 /*
 #cgo CFLAGS: -I../include
-#cgo LDFLAGS: -L${SRCDIR}/libs -lUltralightCore -lWebCore -lUltralight -lAppCore
+#cgo windows,386 LDFLAGS: -L${SRCDIR}/libs/windows/x32
+#cgo windows,amd64 LDFLAGS: -L${SRCDIR}/libs/windows/x64 
+#cgo darwin,amd64 LDFLAGS: -L${SRCDIR}/libs/darwin/x64 
+#cgo linux,amd64 LDFLAGS: -L${SRCDIR}/libs/linux/x64 
+#cgo LDFLAGS: -lUltralightCore -lWebCore -lUltralight -lAppCore
 #include "AppCore/CAPI.h"
 #include <stdlib.h>
 #include "cgo_helpers.h"
diff --git a/ultralight/const.go b/ultralight/const.go
index 62851f1..37291cb 100644
--- a/ultralight/const.go
+++ b/ultralight/const.go
@@ -7,7 +7,11 @@ package ultralight
 
 /*
 #cgo CFLAGS: -I../include
-#cgo LDFLAGS: -L${SRCDIR}/libs -lUltralightCore -lWebCore -lUltralight -lAppCore
+#cgo windows,386 LDFLAGS: -L${SRCDIR}/libs/windows/x32
+#cgo windows,amd64 LDFLAGS: -L${SRCDIR}/libs/windows/x64 
+#cgo darwin,amd64 LDFLAGS: -L${SRCDIR}/libs/darwin/x64 
+#cgo linux,amd64 LDFLAGS: -L${SRCDIR}/libs/linux/x64 
+#cgo LDFLAGS: -lUltralightCore -lWebCore -lUltralight -lAppCore
 #include "AppCore/CAPI.h"
 #include <stdlib.h>
 #include "cgo_helpers.h"
diff --git a/ultralight/libs/Ultralight.dll b/ultralight/libs/Ultralight.dll
deleted file mode 100644
index b2b7c79..0000000
Binary files a/ultralight/libs/Ultralight.dll and /dev/null differ
diff --git a/ultralight/libs/libAppCore.dylib b/ultralight/libs/darwin/x64/libAppCore.dylib
similarity index 100%
rename from ultralight/libs/libAppCore.dylib
rename to ultralight/libs/darwin/x64/libAppCore.dylib
diff --git a/ultralight/libs/libUltralight.dylib b/ultralight/libs/darwin/x64/libUltralight.dylib
similarity index 100%
rename from ultralight/libs/libUltralight.dylib
rename to ultralight/libs/darwin/x64/libUltralight.dylib
diff --git a/ultralight/libs/libUltralightCore.dylib b/ultralight/libs/darwin/x64/libUltralightCore.dylib
similarity index 100%
rename from ultralight/libs/libUltralightCore.dylib
rename to ultralight/libs/darwin/x64/libUltralightCore.dylib
diff --git a/ultralight/libs/libWebCore.dylib b/ultralight/libs/darwin/x64/libWebCore.dylib
similarity index 100%
rename from ultralight/libs/libWebCore.dylib
rename to ultralight/libs/darwin/x64/libWebCore.dylib
diff --git a/ultralight/libs/libAppCore.so b/ultralight/libs/linux/x64/libAppCore.so
similarity index 100%
rename from ultralight/libs/libAppCore.so
rename to ultralight/libs/linux/x64/libAppCore.so
diff --git a/ultralight/libs/libUltralight.so b/ultralight/libs/linux/x64/libUltralight.so
similarity index 100%
rename from ultralight/libs/libUltralight.so
rename to ultralight/libs/linux/x64/libUltralight.so
diff --git a/ultralight/libs/libUltralightCore.so b/ultralight/libs/linux/x64/libUltralightCore.so
similarity index 100%
rename from ultralight/libs/libUltralightCore.so
rename to ultralight/libs/linux/x64/libUltralightCore.so
diff --git a/ultralight/libs/libWebCore.so b/ultralight/libs/linux/x64/libWebCore.so
similarity index 100%
rename from ultralight/libs/libWebCore.so
rename to ultralight/libs/linux/x64/libWebCore.so
diff --git a/ultralight/libs/windows/x32/AppCore.dll b/ultralight/libs/windows/x32/AppCore.dll
new file mode 100644
index 0000000..129a277
Binary files /dev/null and b/ultralight/libs/windows/x32/AppCore.dll differ
diff --git a/ultralight/libs/windows/x32/Ultralight.dll b/ultralight/libs/windows/x32/Ultralight.dll
new file mode 100644
index 0000000..6916880
Binary files /dev/null and b/ultralight/libs/windows/x32/Ultralight.dll differ
diff --git a/ultralight/libs/windows/x32/UltralightCore.dll b/ultralight/libs/windows/x32/UltralightCore.dll
new file mode 100644
index 0000000..e314fb4
Binary files /dev/null and b/ultralight/libs/windows/x32/UltralightCore.dll differ
diff --git a/ultralight/libs/windows/x32/WebCore.dll b/ultralight/libs/windows/x32/WebCore.dll
new file mode 100644
index 0000000..26c7e6c
Binary files /dev/null and b/ultralight/libs/windows/x32/WebCore.dll differ
diff --git a/ultralight/libs/AppCore.dll b/ultralight/libs/windows/x64/AppCore.dll
similarity index 70%
rename from ultralight/libs/AppCore.dll
rename to ultralight/libs/windows/x64/AppCore.dll
index 03c828d..f225f37 100644
Binary files a/ultralight/libs/AppCore.dll and b/ultralight/libs/windows/x64/AppCore.dll differ
diff --git a/ultralight/libs/windows/x64/Ultralight.dll b/ultralight/libs/windows/x64/Ultralight.dll
new file mode 100644
index 0000000..a86a048
Binary files /dev/null and b/ultralight/libs/windows/x64/Ultralight.dll differ
diff --git a/ultralight/libs/UltralightCore.dll b/ultralight/libs/windows/x64/UltralightCore.dll
similarity index 67%
rename from ultralight/libs/UltralightCore.dll
rename to ultralight/libs/windows/x64/UltralightCore.dll
index d63d5e0..2290996 100644
Binary files a/ultralight/libs/UltralightCore.dll and b/ultralight/libs/windows/x64/UltralightCore.dll differ
diff --git a/ultralight/libs/WebCore.dll b/ultralight/libs/windows/x64/WebCore.dll
similarity index 100%
rename from ultralight/libs/WebCore.dll
rename to ultralight/libs/windows/x64/WebCore.dll
diff --git a/ultralight/types.go b/ultralight/types.go
index 51538f4..557aa78 100644
--- a/ultralight/types.go
+++ b/ultralight/types.go
@@ -7,7 +7,11 @@ package ultralight
 
 /*
 #cgo CFLAGS: -I../include
-#cgo LDFLAGS: -L${SRCDIR}/libs -lUltralightCore -lWebCore -lUltralight -lAppCore
+#cgo windows,386 LDFLAGS: -L${SRCDIR}/libs/windows/x32
+#cgo windows,amd64 LDFLAGS: -L${SRCDIR}/libs/windows/x64 
+#cgo darwin,amd64 LDFLAGS: -L${SRCDIR}/libs/darwin/x64 
+#cgo linux,amd64 LDFLAGS: -L${SRCDIR}/libs/linux/x64 
+#cgo LDFLAGS: -lUltralightCore -lWebCore -lUltralight -lAppCore
 #include "AppCore/CAPI.h"
 #include <stdlib.h>
 #include "cgo_helpers.h"
diff --git a/ultralight/ultralight.go b/ultralight/ultralight.go
index 6ff2641..c64b674 100644
--- a/ultralight/ultralight.go
+++ b/ultralight/ultralight.go
@@ -7,7 +7,11 @@ package ultralight
 
 /*
 #cgo CFLAGS: -I../include
-#cgo LDFLAGS: -L${SRCDIR}/libs -lUltralightCore -lWebCore -lUltralight -lAppCore
+#cgo windows,386 LDFLAGS: -L${SRCDIR}/libs/windows/x32
+#cgo windows,amd64 LDFLAGS: -L${SRCDIR}/libs/windows/x64 
+#cgo darwin,amd64 LDFLAGS: -L${SRCDIR}/libs/darwin/x64 
+#cgo linux,amd64 LDFLAGS: -L${SRCDIR}/libs/linux/x64 
+#cgo LDFLAGS: -lUltralightCore -lWebCore -lUltralight -lAppCore
 #include "AppCore/CAPI.h"
 #include <stdlib.h>
 #include "cgo_helpers.h"