diff --git a/win32/dfl/.gitignore b/.gitignore
similarity index 100%
rename from win32/dfl/.gitignore
rename to .gitignore
diff --git a/README.md b/README.md
index 8c6cdf5..5984856 100644
--- a/README.md
+++ b/README.md
@@ -1,15 +1,15 @@
 
-
 # DFL
 This unofficial project is a migration of [D Forms Library (DFL)](http://http://wiki.dprogramming.com/Dfl/HomePage "D Forms Library (DFL)") that is managed on SVN.
 DFL is a Win32 windowing library for the D language.
 
 ## Recent major features
- - Remove dflexe.
- - Remove GTK-based DFL.
- - Remove some bundled libraries such as user32_dfl.lib etc... (From now on, use dmd-bundled libraries such as the MinGW platform library and so on.)
+- DUB is available for DFL.
+- Remove dflexe.
+- Remove GTK-based DFL.
+- Remove some bundled libraries such as user32_dfl.lib etc... (From now on, use dmd-bundled libraries such as the MinGW platform library and so on.)
 
-## Build and Install
+## Build and Install (dfl.lib and dfl_debug.lib)
 ### 1. Set environment variables
 Fix the paths below:
 ```bat
@@ -19,7 +19,7 @@ set dmc_path=c:\dmc\dm
 ### 2. Install the undeaD library
 DFL is required the undeaD library (**undead.lib**).
 Download a ZIP file from https://github.com/dlang/undead.
-Extract **undeaD-master.zip** and run the bellow with either option -a=x86_omf, x86_32mscoff or x86_64:
+Extract **undeaD-master.zip** and run the below with either option -a=x86_omf, x86_32mscoff or x86_64:
 ```bat
 > cd undeaD-master
 > dub build -a=x86_omf
@@ -50,11 +50,32 @@ or (MSVC required)
 ```
 Also copy **dfl.lib** and **dfl_debug.lib** to your/lib/dir.
 
-In order to make and move *.lib to paths bellow:
+**IMPORTANT**: Both library files are containing the **undead.lib** and WINSDK libraries such as **user32.lib**, **gdi32.lib** and so on.
+
+In order to make and move *.lib to paths below:
 - **go32omf.bat** : Make and move *.lib to %dmd_path%\lib
 - **go.bat** (MSVC required) : Make and move *.lib to %dmd_path%\lib32mscoff
 - **go.bat 32mscoff** (MSVC required) : ditto
 - **go64.bat** (MSVC required) : Make and move *.lib to %dmd_path%\lib64
 
+## With DUB
+First, in order to add to local DUB registry:
+```bat
+> cd dfl
+> dub add-local .
+> dub list
+Packages present in the system and known to dub:
+  dfl ~master: c:\your\path\dfl\
+```
+Build and run your GUI applications with DUB as below:
+```bat
+> cd examples\hello_dfl
+> dub build -a=x86_omf
+> dub run
+```
+See also **./examples/hello_dfl/dub.json**.
+
+**IMPORTANT**: DUB is building **dfl_dub.lib** that is **not** containing **undead.lib** and WINSDK libraries.
+
 ## License
 boost and/or zlib/libpng
diff --git a/win32/dfl/_cmd.bat b/_cmd.bat
similarity index 100%
rename from win32/dfl/_cmd.bat
rename to _cmd.bat
diff --git a/dub.json b/dub.json
new file mode 100644
index 0000000..63fcc16
--- /dev/null
+++ b/dub.json
@@ -0,0 +1,52 @@
+{
+	"authors": [
+		"various"
+	],
+	"dependencies": {
+		"undead": "~>1.1.8"
+	},
+	"description": "D Forms Library, or DFL, is a Win32 windowing library for the D language.",
+	"license": "in license.txt",
+	"name": "dfl",
+	"targetType": "staticLibrary",
+	"targetPath": "bin",
+	"targetName": "dfl_dub",
+	"homepage": "https://github.com/Rayerd/dfl",
+	"versions": [
+		"DFL_UNICODE",
+		"REDEFINE_UUIDS"
+	],
+	"libs-windows-x86_omf-dmd": [
+		"$DFL_PACKAGE_DIR/lib/windows-x86_omf/user32",
+		"$DFL_PACKAGE_DIR/lib/windows-x86_omf/shell32",
+		"$DFL_PACKAGE_DIR/lib/windows-x86_omf/gdi32",
+		"$DFL_PACKAGE_DIR/lib/windows-x86_omf/comctl32",
+		"$DFL_PACKAGE_DIR/lib/windows-x86_omf/advapi32",
+		"$DFL_PACKAGE_DIR/lib/windows-x86_omf/comdlg32",
+		"$DFL_PACKAGE_DIR/lib/windows-x86_omf/ole32",
+		"$DFL_PACKAGE_DIR/lib/windows-x86_omf/OLEAUT32",
+		"$DFL_PACKAGE_DIR/lib/windows-x86_omf/ws2_32"
+	],
+	"libs-windows-x86_mscoff-dmd": [
+		"$DFL_PACKAGE_DIR/lib/windows-x86_mscoff/user32",
+		"$DFL_PACKAGE_DIR/lib/windows-x86_mscoff/shell32",
+		"$DFL_PACKAGE_DIR/lib/windows-x86_mscoff/gdi32",
+		"$DFL_PACKAGE_DIR/lib/windows-x86_mscoff/comctl32",
+		"$DFL_PACKAGE_DIR/lib/windows-x86_mscoff/advapi32",
+		"$DFL_PACKAGE_DIR/lib/windows-x86_mscoff/comdlg32",
+		"$DFL_PACKAGE_DIR/lib/windows-x86_mscoff/ole32",
+		"$DFL_PACKAGE_DIR/lib/windows-x86_mscoff/OLEAUT32",
+		"$DFL_PACKAGE_DIR/lib/windows-x86_mscoff/ws2_32"
+	],
+	"libs-windows-x86_64-dmd": [
+		"$DFL_PACKAGE_DIR/lib/windows-x86_64/user32",
+		"$DFL_PACKAGE_DIR/lib/windows-x86_64/shell32",
+		"$DFL_PACKAGE_DIR/lib/windows-x86_64/gdi32",
+		"$DFL_PACKAGE_DIR/lib/windows-x86_64/comctl32",
+		"$DFL_PACKAGE_DIR/lib/windows-x86_64/advapi32",
+		"$DFL_PACKAGE_DIR/lib/windows-x86_64/comdlg32",
+		"$DFL_PACKAGE_DIR/lib/windows-x86_64/ole32",
+		"$DFL_PACKAGE_DIR/lib/windows-x86_64/OLEAUT32",
+		"$DFL_PACKAGE_DIR/lib/windows-x86_64/ws2_32"
+	]
+}
diff --git a/examples/hello_dfl/.gitignore b/examples/hello_dfl/.gitignore
new file mode 100644
index 0000000..60a5f2a
--- /dev/null
+++ b/examples/hello_dfl/.gitignore
@@ -0,0 +1,16 @@
+.dub
+docs.json
+__dummy.html
+docs/
+/hello_dfl
+hello_dfl.so
+hello_dfl.dylib
+hello_dfl.dll
+hello_dfl.a
+hello_dfl.lib
+hello_dfl-test-*
+*.exe
+*.pdb
+*.o
+*.obj
+*.lst
diff --git a/win32/examples/hello_dfl/build.bat b/examples/hello_dfl/build.bat
similarity index 78%
rename from win32/examples/hello_dfl/build.bat
rename to examples/hello_dfl/build.bat
index f0bf584..7673187 100644
--- a/win32/examples/hello_dfl/build.bat
+++ b/examples/hello_dfl/build.bat
@@ -1,2 +1,4 @@
+pushd source
 dmd -m32omf -L/exet:nt/su:windows:4.0 hello_dfl.d
 hello_dfl.exe
+popd
diff --git a/win32/examples/hello_dfl/build32mscoff.bat b/examples/hello_dfl/build32mscoff.bat
similarity index 82%
rename from win32/examples/hello_dfl/build32mscoff.bat
rename to examples/hello_dfl/build32mscoff.bat
index c53d87a..7228bd2 100644
--- a/win32/examples/hello_dfl/build32mscoff.bat
+++ b/examples/hello_dfl/build32mscoff.bat
@@ -1,2 +1,4 @@
+pushd source
 dmd -m32mscoff -L/SUBSYSTEM:WINDOWS -L/ENTRY:mainCRTStartup hello_dfl.d
 hello_dfl.exe
+popd
diff --git a/win32/examples/hello_dfl/build64.bat b/examples/hello_dfl/build64.bat
similarity index 81%
rename from win32/examples/hello_dfl/build64.bat
rename to examples/hello_dfl/build64.bat
index a31ff0a..bb54e1d 100644
--- a/win32/examples/hello_dfl/build64.bat
+++ b/examples/hello_dfl/build64.bat
@@ -1,2 +1,4 @@
+pushd source
 dmd -m64 -L/SUBSYSTEM:WINDOWS -L/ENTRY:mainCRTStartup hello_dfl.d
 hello_dfl.exe
+popd
diff --git a/examples/hello_dfl/dub.json b/examples/hello_dfl/dub.json
new file mode 100644
index 0000000..94f3692
--- /dev/null
+++ b/examples/hello_dfl/dub.json
@@ -0,0 +1,16 @@
+{
+	"authors": ["haru-s"],
+	"copyright": "Copyright (C) 2022 haru-s",
+	"description": "DFL sample code.",
+	"name": "hello_dfl",
+	"targetType": "executable",
+	"targetPath": "bin",
+	"dependencies": {
+		"dfl": {
+			"path": "../../../dfl"
+		}
+	},
+	"lflags-windows-x86_omf-dmd":    ["/exet:nt/su:windows:6.0"],
+	"lflags-windows-x86_mscoff-dmd": ["/SUBSYSTEM:WINDOWS", "/ENTRY:mainCRTStartup"],
+	"lflags-windows-x86_64-dmd":     ["/SUBSYSTEM:WINDOWS", "/ENTRY:mainCRTStartup"]
+}
\ No newline at end of file
diff --git a/win32/examples/hello_dfl/shell.bat b/examples/hello_dfl/shell.bat
similarity index 100%
rename from win32/examples/hello_dfl/shell.bat
rename to examples/hello_dfl/shell.bat
diff --git a/win32/examples/hello_dfl/hello_dfl.d b/examples/hello_dfl/source/hello_dfl.d
similarity index 100%
rename from win32/examples/hello_dfl/hello_dfl.d
rename to examples/hello_dfl/source/hello_dfl.d
diff --git a/win32/dfl/go.bat b/go.bat
similarity index 93%
rename from win32/dfl/go.bat
rename to go.bat
index dc2f2f1..03938dd 100644
--- a/win32/dfl/go.bat
+++ b/go.bat
@@ -31,6 +31,8 @@ call makelib "%~1"
 @rem   @move /Y dfl.lib %dmd_lib_path%
 @rem   @if errorlevel 1 goto fail
 
+@pushd source\dfl
+
 @move /Y dfl*.lib %dmd_lib_path%
 @if errorlevel 1 goto fail
 
@@ -47,3 +49,5 @@ call makelib "%~1"
 
 :done
 @echo Done.
+
+@popd
diff --git a/win32/dfl/go32omf.bat.lnk b/go32omf.bat.lnk
similarity index 100%
rename from win32/dfl/go32omf.bat.lnk
rename to go32omf.bat.lnk
diff --git a/win32/dfl/go64.bat.lnk b/go64.bat.lnk
similarity index 100%
rename from win32/dfl/go64.bat.lnk
rename to go64.bat.lnk
diff --git a/win32/dfl/lgpl.txt b/lgpl.txt
similarity index 100%
rename from win32/dfl/lgpl.txt
rename to lgpl.txt
diff --git a/lib/windows-x86_64/README.txt b/lib/windows-x86_64/README.txt
new file mode 100644
index 0000000..eb300bb
--- /dev/null
+++ b/lib/windows-x86_64/README.txt
@@ -0,0 +1,10 @@
+Windows SDK Libraries from \dmd2\windows\lib64
+advapi32.lib
+COMCTL32.LIB
+comdlg32.lib
+gdi32.lib
+ole32.lib
+OLEAUT32.LIB
+shell32.lib
+user32.lib
+WS2_32.LIB
diff --git a/lib/windows-x86_64/advapi32.lib b/lib/windows-x86_64/advapi32.lib
new file mode 100644
index 0000000..acb18cc
Binary files /dev/null and b/lib/windows-x86_64/advapi32.lib differ
diff --git a/lib/windows-x86_64/comctl32.lib b/lib/windows-x86_64/comctl32.lib
new file mode 100644
index 0000000..89f76f5
Binary files /dev/null and b/lib/windows-x86_64/comctl32.lib differ
diff --git a/lib/windows-x86_64/comdlg32.lib b/lib/windows-x86_64/comdlg32.lib
new file mode 100644
index 0000000..b9eda61
Binary files /dev/null and b/lib/windows-x86_64/comdlg32.lib differ
diff --git a/lib/windows-x86_64/gdi32.lib b/lib/windows-x86_64/gdi32.lib
new file mode 100644
index 0000000..93e7921
Binary files /dev/null and b/lib/windows-x86_64/gdi32.lib differ
diff --git a/lib/windows-x86_64/ole32.lib b/lib/windows-x86_64/ole32.lib
new file mode 100644
index 0000000..b6eb29c
Binary files /dev/null and b/lib/windows-x86_64/ole32.lib differ
diff --git a/lib/windows-x86_64/oleaut32.lib b/lib/windows-x86_64/oleaut32.lib
new file mode 100644
index 0000000..5b2952a
Binary files /dev/null and b/lib/windows-x86_64/oleaut32.lib differ
diff --git a/lib/windows-x86_64/shell32.lib b/lib/windows-x86_64/shell32.lib
new file mode 100644
index 0000000..25cf874
Binary files /dev/null and b/lib/windows-x86_64/shell32.lib differ
diff --git a/lib/windows-x86_64/user32.lib b/lib/windows-x86_64/user32.lib
new file mode 100644
index 0000000..e56968a
Binary files /dev/null and b/lib/windows-x86_64/user32.lib differ
diff --git a/lib/windows-x86_64/ws2_32.lib b/lib/windows-x86_64/ws2_32.lib
new file mode 100644
index 0000000..9430a70
Binary files /dev/null and b/lib/windows-x86_64/ws2_32.lib differ
diff --git a/lib/windows-x86_mscoff/README.txt b/lib/windows-x86_mscoff/README.txt
new file mode 100644
index 0000000..85d980d
--- /dev/null
+++ b/lib/windows-x86_mscoff/README.txt
@@ -0,0 +1,10 @@
+Windows SDK Libraries from \dmd2\windows\lib32mscoff\mingw
+advapi32.lib
+COMCTL32.LIB
+comdlg32.lib
+gdi32.lib
+ole32.lib
+OLEAUT32.LIB
+shell32.lib
+user32.lib
+WS2_32.LIB
diff --git a/lib/windows-x86_mscoff/advapi32.lib b/lib/windows-x86_mscoff/advapi32.lib
new file mode 100644
index 0000000..7da8fa9
Binary files /dev/null and b/lib/windows-x86_mscoff/advapi32.lib differ
diff --git a/lib/windows-x86_mscoff/comctl32.lib b/lib/windows-x86_mscoff/comctl32.lib
new file mode 100644
index 0000000..b5ec1c3
Binary files /dev/null and b/lib/windows-x86_mscoff/comctl32.lib differ
diff --git a/lib/windows-x86_mscoff/comdlg32.lib b/lib/windows-x86_mscoff/comdlg32.lib
new file mode 100644
index 0000000..3ec90d2
Binary files /dev/null and b/lib/windows-x86_mscoff/comdlg32.lib differ
diff --git a/lib/windows-x86_mscoff/gdi32.lib b/lib/windows-x86_mscoff/gdi32.lib
new file mode 100644
index 0000000..541a954
Binary files /dev/null and b/lib/windows-x86_mscoff/gdi32.lib differ
diff --git a/lib/windows-x86_mscoff/ole32.lib b/lib/windows-x86_mscoff/ole32.lib
new file mode 100644
index 0000000..0fd4c35
Binary files /dev/null and b/lib/windows-x86_mscoff/ole32.lib differ
diff --git a/lib/windows-x86_mscoff/oleaut32.lib b/lib/windows-x86_mscoff/oleaut32.lib
new file mode 100644
index 0000000..0a30723
Binary files /dev/null and b/lib/windows-x86_mscoff/oleaut32.lib differ
diff --git a/lib/windows-x86_mscoff/shell32.lib b/lib/windows-x86_mscoff/shell32.lib
new file mode 100644
index 0000000..2a1115f
Binary files /dev/null and b/lib/windows-x86_mscoff/shell32.lib differ
diff --git a/lib/windows-x86_mscoff/user32.lib b/lib/windows-x86_mscoff/user32.lib
new file mode 100644
index 0000000..c639d1e
Binary files /dev/null and b/lib/windows-x86_mscoff/user32.lib differ
diff --git a/lib/windows-x86_mscoff/ws2_32.lib b/lib/windows-x86_mscoff/ws2_32.lib
new file mode 100644
index 0000000..b2fab10
Binary files /dev/null and b/lib/windows-x86_mscoff/ws2_32.lib differ
diff --git a/lib/windows-x86_omf/COMCTL32.LIB b/lib/windows-x86_omf/COMCTL32.LIB
new file mode 100644
index 0000000..3d65984
Binary files /dev/null and b/lib/windows-x86_omf/COMCTL32.LIB differ
diff --git a/lib/windows-x86_omf/OLEAUT32.LIB b/lib/windows-x86_omf/OLEAUT32.LIB
new file mode 100644
index 0000000..91169bc
Binary files /dev/null and b/lib/windows-x86_omf/OLEAUT32.LIB differ
diff --git a/lib/windows-x86_omf/README.txt b/lib/windows-x86_omf/README.txt
new file mode 100644
index 0000000..38eda81
--- /dev/null
+++ b/lib/windows-x86_omf/README.txt
@@ -0,0 +1,10 @@
+Windows SDK Libraries from \dmd2\windows\lib
+advapi32.lib
+COMCTL32.LIB
+comdlg32.lib
+gdi32.lib
+ole32.lib
+OLEAUT32.LIB
+shell32.lib
+user32.lib
+WS2_32.LIB
diff --git a/lib/windows-x86_omf/WS2_32.LIB b/lib/windows-x86_omf/WS2_32.LIB
new file mode 100644
index 0000000..efc2a63
Binary files /dev/null and b/lib/windows-x86_omf/WS2_32.LIB differ
diff --git a/lib/windows-x86_omf/advapi32.lib b/lib/windows-x86_omf/advapi32.lib
new file mode 100644
index 0000000..d18761b
Binary files /dev/null and b/lib/windows-x86_omf/advapi32.lib differ
diff --git a/lib/windows-x86_omf/comdlg32.lib b/lib/windows-x86_omf/comdlg32.lib
new file mode 100644
index 0000000..82b53b9
Binary files /dev/null and b/lib/windows-x86_omf/comdlg32.lib differ
diff --git a/lib/windows-x86_omf/gdi32.lib b/lib/windows-x86_omf/gdi32.lib
new file mode 100644
index 0000000..667f11d
Binary files /dev/null and b/lib/windows-x86_omf/gdi32.lib differ
diff --git a/lib/windows-x86_omf/ole32.lib b/lib/windows-x86_omf/ole32.lib
new file mode 100644
index 0000000..c0ab1cc
Binary files /dev/null and b/lib/windows-x86_omf/ole32.lib differ
diff --git a/lib/windows-x86_omf/shell32.lib b/lib/windows-x86_omf/shell32.lib
new file mode 100644
index 0000000..8fffc1a
Binary files /dev/null and b/lib/windows-x86_omf/shell32.lib differ
diff --git a/lib/windows-x86_omf/user32.lib b/lib/windows-x86_omf/user32.lib
new file mode 100644
index 0000000..fdafc35
Binary files /dev/null and b/lib/windows-x86_omf/user32.lib differ
diff --git a/win32/dfl/license.txt b/license.txt
similarity index 100%
rename from win32/dfl/license.txt
rename to license.txt
diff --git a/win32/dfl/makecoff.bat b/makecoff.bat
similarity index 99%
rename from win32/dfl/makecoff.bat
rename to makecoff.bat
index 20aee3b..6373a79 100644
--- a/win32/dfl/makecoff.bat
+++ b/makecoff.bat
@@ -16,6 +16,9 @@
 @echo off
 @cls
 
+@rem   For DUB.
+pushd source\dfl
+
 @rem   You can change the default object model here
 set MODEL=32mscoff
 if not "%~1"=="" set MODEL=%~1
@@ -158,3 +161,6 @@ if not "%dfl_release_flags%" == "" goto dfl_release_flags_set
 :done
 @echo.
 @echo makecoff.bat completed.
+
+@rem   For DUB.
+@popd
diff --git a/win32/dfl/makelib.bat b/makelib.bat
similarity index 94%
rename from win32/dfl/makelib.bat
rename to makelib.bat
index 2fbd028..55297ac 100644
--- a/win32/dfl/makelib.bat
+++ b/makelib.bat
@@ -22,12 +22,17 @@
   @call makecoff.bat
   goto done
 )
-@if "%~1" == "32omf" set dmd_omf_flag=-m32omf
-else set dmd_omf_flag=
+@if "%~1" == "32omf" (
+  set dmd_omf_flag=-m32omf
+) else (
+  set dmd_omf_flag=
+)
 
 @echo off
 @cls
 
+@rem   For DUB.
+pushd source\dfl
 
 @rem   Either set the environment variables dmd_path and dmc_path
 @rem   or fix the paths below.
@@ -144,3 +149,6 @@ if not "%dfl_release_flags%" == "" goto dfl_release_flags_set
 
 @rem   @del %dfl_objs%
 @del *.obj
+
+@rem   For DUB.
+@popd
diff --git a/win32/dfl/makelibtango.bat b/makelibtango.bat
similarity index 100%
rename from win32/dfl/makelibtango.bat
rename to makelibtango.bat
diff --git a/win32/dfl/all.d b/source/dfl/all.d
similarity index 100%
rename from win32/dfl/all.d
rename to source/dfl/all.d
diff --git a/win32/dfl/application.d b/source/dfl/application.d
similarity index 100%
rename from win32/dfl/application.d
rename to source/dfl/application.d
diff --git a/win32/dfl/base.d b/source/dfl/base.d
similarity index 100%
rename from win32/dfl/base.d
rename to source/dfl/base.d
diff --git a/win32/dfl/button.d b/source/dfl/button.d
similarity index 100%
rename from win32/dfl/button.d
rename to source/dfl/button.d
diff --git a/win32/dfl/clipboard.d b/source/dfl/clipboard.d
similarity index 100%
rename from win32/dfl/clipboard.d
rename to source/dfl/clipboard.d
diff --git a/win32/dfl/clippingform.d b/source/dfl/clippingform.d
similarity index 100%
rename from win32/dfl/clippingform.d
rename to source/dfl/clippingform.d
diff --git a/win32/dfl/collections.d b/source/dfl/collections.d
similarity index 100%
rename from win32/dfl/collections.d
rename to source/dfl/collections.d
diff --git a/win32/dfl/colordialog.d b/source/dfl/colordialog.d
similarity index 100%
rename from win32/dfl/colordialog.d
rename to source/dfl/colordialog.d
diff --git a/win32/dfl/com.d b/source/dfl/com.d
similarity index 100%
rename from win32/dfl/com.d
rename to source/dfl/com.d
diff --git a/win32/dfl/combobox.d b/source/dfl/combobox.d
similarity index 100%
rename from win32/dfl/combobox.d
rename to source/dfl/combobox.d
diff --git a/win32/dfl/commondialog.d b/source/dfl/commondialog.d
similarity index 100%
rename from win32/dfl/commondialog.d
rename to source/dfl/commondialog.d
diff --git a/win32/dfl/control.d b/source/dfl/control.d
similarity index 100%
rename from win32/dfl/control.d
rename to source/dfl/control.d
diff --git a/win32/dfl/data.d b/source/dfl/data.d
similarity index 100%
rename from win32/dfl/data.d
rename to source/dfl/data.d
diff --git a/win32/dfl/drawing.d b/source/dfl/drawing.d
similarity index 100%
rename from win32/dfl/drawing.d
rename to source/dfl/drawing.d
diff --git a/win32/dfl/environment.d b/source/dfl/environment.d
similarity index 100%
rename from win32/dfl/environment.d
rename to source/dfl/environment.d
diff --git a/win32/dfl/event.d b/source/dfl/event.d
similarity index 100%
rename from win32/dfl/event.d
rename to source/dfl/event.d
diff --git a/win32/dfl/filedialog.d b/source/dfl/filedialog.d
similarity index 100%
rename from win32/dfl/filedialog.d
rename to source/dfl/filedialog.d
diff --git a/win32/dfl/folderdialog.d b/source/dfl/folderdialog.d
similarity index 100%
rename from win32/dfl/folderdialog.d
rename to source/dfl/folderdialog.d
diff --git a/win32/dfl/fontdialog.d b/source/dfl/fontdialog.d
similarity index 100%
rename from win32/dfl/fontdialog.d
rename to source/dfl/fontdialog.d
diff --git a/win32/dfl/form.d b/source/dfl/form.d
similarity index 100%
rename from win32/dfl/form.d
rename to source/dfl/form.d
diff --git a/win32/dfl/groupbox.d b/source/dfl/groupbox.d
similarity index 100%
rename from win32/dfl/groupbox.d
rename to source/dfl/groupbox.d
diff --git a/win32/dfl/imagelist.d b/source/dfl/imagelist.d
similarity index 100%
rename from win32/dfl/imagelist.d
rename to source/dfl/imagelist.d
diff --git a/win32/dfl/internal/clib.d b/source/dfl/internal/clib.d
similarity index 100%
rename from win32/dfl/internal/clib.d
rename to source/dfl/internal/clib.d
diff --git a/win32/dfl/internal/com.d b/source/dfl/internal/com.d
similarity index 100%
rename from win32/dfl/internal/com.d
rename to source/dfl/internal/com.d
diff --git a/win32/dfl/internal/d1.d b/source/dfl/internal/d1.d
similarity index 100%
rename from win32/dfl/internal/d1.d
rename to source/dfl/internal/d1.d
diff --git a/win32/dfl/internal/d2.d b/source/dfl/internal/d2.d
similarity index 100%
rename from win32/dfl/internal/d2.d
rename to source/dfl/internal/d2.d
diff --git a/win32/dfl/internal/dlib.d b/source/dfl/internal/dlib.d
similarity index 100%
rename from win32/dfl/internal/dlib.d
rename to source/dfl/internal/dlib.d
diff --git a/win32/dfl/internal/utf.d b/source/dfl/internal/utf.d
similarity index 100%
rename from win32/dfl/internal/utf.d
rename to source/dfl/internal/utf.d
diff --git a/win32/dfl/internal/winapi.d b/source/dfl/internal/winapi.d
similarity index 100%
rename from win32/dfl/internal/winapi.d
rename to source/dfl/internal/winapi.d
diff --git a/win32/dfl/internal/wincom.d b/source/dfl/internal/wincom.d
similarity index 100%
rename from win32/dfl/internal/wincom.d
rename to source/dfl/internal/wincom.d
diff --git a/win32/dfl/label.d b/source/dfl/label.d
similarity index 100%
rename from win32/dfl/label.d
rename to source/dfl/label.d
diff --git a/win32/dfl/listbox.d b/source/dfl/listbox.d
similarity index 100%
rename from win32/dfl/listbox.d
rename to source/dfl/listbox.d
diff --git a/win32/dfl/listview.d b/source/dfl/listview.d
similarity index 100%
rename from win32/dfl/listview.d
rename to source/dfl/listview.d
diff --git a/win32/dfl/menu.d b/source/dfl/menu.d
similarity index 100%
rename from win32/dfl/menu.d
rename to source/dfl/menu.d
diff --git a/win32/dfl/messagebox.d b/source/dfl/messagebox.d
similarity index 100%
rename from win32/dfl/messagebox.d
rename to source/dfl/messagebox.d
diff --git a/win32/dfl/notifyicon.d b/source/dfl/notifyicon.d
similarity index 100%
rename from win32/dfl/notifyicon.d
rename to source/dfl/notifyicon.d
diff --git a/win32/dfl/package.d b/source/dfl/package.d
similarity index 100%
rename from win32/dfl/package.d
rename to source/dfl/package.d
diff --git a/win32/dfl/panel.d b/source/dfl/panel.d
similarity index 100%
rename from win32/dfl/panel.d
rename to source/dfl/panel.d
diff --git a/win32/dfl/picturebox.d b/source/dfl/picturebox.d
similarity index 100%
rename from win32/dfl/picturebox.d
rename to source/dfl/picturebox.d
diff --git a/win32/dfl/progressbar.d b/source/dfl/progressbar.d
similarity index 100%
rename from win32/dfl/progressbar.d
rename to source/dfl/progressbar.d
diff --git a/win32/dfl/registry.d b/source/dfl/registry.d
similarity index 100%
rename from win32/dfl/registry.d
rename to source/dfl/registry.d
diff --git a/win32/dfl/resources.d b/source/dfl/resources.d
similarity index 100%
rename from win32/dfl/resources.d
rename to source/dfl/resources.d
diff --git a/win32/dfl/richtextbox.d b/source/dfl/richtextbox.d
similarity index 100%
rename from win32/dfl/richtextbox.d
rename to source/dfl/richtextbox.d
diff --git a/win32/dfl/socket.d b/source/dfl/socket.d
similarity index 100%
rename from win32/dfl/socket.d
rename to source/dfl/socket.d
diff --git a/win32/dfl/splitter.d b/source/dfl/splitter.d
similarity index 100%
rename from win32/dfl/splitter.d
rename to source/dfl/splitter.d
diff --git a/win32/dfl/statusbar.d b/source/dfl/statusbar.d
similarity index 100%
rename from win32/dfl/statusbar.d
rename to source/dfl/statusbar.d
diff --git a/win32/dfl/tabcontrol.d b/source/dfl/tabcontrol.d
similarity index 100%
rename from win32/dfl/tabcontrol.d
rename to source/dfl/tabcontrol.d
diff --git a/win32/dfl/textbox.d b/source/dfl/textbox.d
similarity index 100%
rename from win32/dfl/textbox.d
rename to source/dfl/textbox.d
diff --git a/win32/dfl/timer.d b/source/dfl/timer.d
similarity index 100%
rename from win32/dfl/timer.d
rename to source/dfl/timer.d
diff --git a/win32/dfl/toolbar.d b/source/dfl/toolbar.d
similarity index 100%
rename from win32/dfl/toolbar.d
rename to source/dfl/toolbar.d
diff --git a/win32/dfl/tooltip.d b/source/dfl/tooltip.d
similarity index 100%
rename from win32/dfl/tooltip.d
rename to source/dfl/tooltip.d
diff --git a/win32/dfl/treeview.d b/source/dfl/treeview.d
similarity index 100%
rename from win32/dfl/treeview.d
rename to source/dfl/treeview.d
diff --git a/win32/dfl/usercontrol.d b/source/dfl/usercontrol.d
similarity index 100%
rename from win32/dfl/usercontrol.d
rename to source/dfl/usercontrol.d
diff --git a/win32/dfl/utf.d b/source/dfl/utf.d
similarity index 100%
rename from win32/dfl/utf.d
rename to source/dfl/utf.d
diff --git a/win32/dfl/winapi.d b/source/dfl/winapi.d
similarity index 100%
rename from win32/dfl/winapi.d
rename to source/dfl/winapi.d
diff --git a/win32/dfl/wincom.d b/source/dfl/wincom.d
similarity index 100%
rename from win32/dfl/wincom.d
rename to source/dfl/wincom.d
diff --git a/win32/dfl/zlib.txt b/zlib.txt
similarity index 100%
rename from win32/dfl/zlib.txt
rename to zlib.txt