diff --git a/MANIFEST.in b/MANIFEST.in
index a266f380b..865e51697 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -10,9 +10,8 @@ include *.txt
 include LICENSE
 include Makefile
 graft Tests
-graft PIL
+graft src
 graft Tk
-graft libImaging
 graft depends
 graft winbuild
 graft docs
diff --git a/setup.py b/setup.py
index 5c36302bd..98d482738 100755
--- a/setup.py
+++ b/setup.py
@@ -19,7 +19,7 @@ import warnings
 from distutils import ccompiler, sysconfig
 from distutils.command.build_ext import build_ext
 
-from setuptools import Extension, find_packages, setup
+from setuptools import Extension, setup
 
 # monkey patch import hook. Even though flake8 says it's not used, it is.
 # comment this out to disable multi threaded builds.
@@ -122,7 +122,7 @@ def _read(file):
 
 
 def get_version():
-    version_file = 'PIL/version.py'
+    version_file = 'src/PIL/version.py'
     with open(version_file, 'r') as f:
         exec(compile(f.read(), version_file, 'exec'))
     return locals()['__version__']
@@ -223,7 +223,7 @@ class pil_build_ext(build_ext):
         library_dirs = []
         include_dirs = []
 
-        _add_directory(include_dirs, "libImaging")
+        _add_directory(include_dirs, "src/libImaging")
 
         pkg_config = None
         if _cmd_exists('pkg-config'):
@@ -583,11 +583,11 @@ class pil_build_ext(build_ext):
         #
         # core library
 
-        files = ["_imaging.c"]
+        files = ["src/_imaging.c"]
         for src_file in _IMAGING:
-            files.append(src_file + ".c")
+            files.append("src/" + src_file + ".c")
         for src_file in _LIB_IMAGING:
-            files.append(os.path.join("libImaging", src_file + ".c"))
+            files.append(os.path.join("src/libImaging", src_file + ".c"))
 
         libs = []
         defs = []
@@ -630,7 +630,7 @@ class pil_build_ext(build_ext):
             libs = ["freetype"]
             defs = []
             exts.append(Extension(
-                "PIL._imagingft", ["_imagingft.c"], libraries=libs,
+                "PIL._imagingft", ["src/_imagingft.c"], libraries=libs,
                 define_macros=defs))
 
         if feature.lcms:
@@ -638,7 +638,7 @@ class pil_build_ext(build_ext):
             if sys.platform == "win32":
                 extra.extend(["user32", "gdi32"])
             exts.append(Extension("PIL._imagingcms",
-                                  ["_imagingcms.c"],
+                                  ["src/_imagingcms.c"],
                                   libraries=[feature.lcms] + extra))
 
         if feature.webp:
@@ -651,18 +651,18 @@ class pil_build_ext(build_ext):
                 libs.append(feature.webpmux.replace('pmux', 'pdemux'))
 
             exts.append(Extension("PIL._webp",
-                                  ["_webp.c"],
+                                  ["src/_webp.c"],
                                   libraries=libs,
                                   define_macros=defs))
 
         tk_libs = ['psapi'] if sys.platform == 'win32' else []
         exts.append(Extension("PIL._imagingtk",
-                              ["_imagingtk.c", "Tk/tkImaging.c"],
+                              ["src/_imagingtk.c", "Tk/tkImaging.c"],
                               include_dirs=['Tk'],
                               libraries=tk_libs))
 
-        exts.append(Extension("PIL._imagingmath", ["_imagingmath.c"]))
-        exts.append(Extension("PIL._imagingmorph", ["_imagingmorph.c"]))
+        exts.append(Extension("PIL._imagingmath", ["src/_imagingmath.c"]))
+        exts.append(Extension("PIL._imagingmorph", ["src/_imagingmorph.c"]))
 
         self.extensions[:] = exts
 
@@ -783,9 +783,10 @@ try:
           cmdclass={"build_ext": pil_build_ext},
           ext_modules=[Extension("PIL._imaging", ["_imaging.c"])],
           include_package_data=True,
-          packages=find_packages(),
           setup_requires=pytest_runner,
           tests_require=['pytest'],
+          packages=["PIL"],
+          package_dir={'':'src'},
           keywords=["Imaging", ],
           license='Standard PIL License',
           zip_safe=not (debug_build() or PLATFORM_MINGW), )
diff --git a/PIL/BdfFontFile.py b/src/PIL/BdfFontFile.py
similarity index 100%
rename from PIL/BdfFontFile.py
rename to src/PIL/BdfFontFile.py
diff --git a/PIL/BmpImagePlugin.py b/src/PIL/BmpImagePlugin.py
similarity index 100%
rename from PIL/BmpImagePlugin.py
rename to src/PIL/BmpImagePlugin.py
diff --git a/PIL/BufrStubImagePlugin.py b/src/PIL/BufrStubImagePlugin.py
similarity index 100%
rename from PIL/BufrStubImagePlugin.py
rename to src/PIL/BufrStubImagePlugin.py
diff --git a/PIL/ContainerIO.py b/src/PIL/ContainerIO.py
similarity index 100%
rename from PIL/ContainerIO.py
rename to src/PIL/ContainerIO.py
diff --git a/PIL/CurImagePlugin.py b/src/PIL/CurImagePlugin.py
similarity index 100%
rename from PIL/CurImagePlugin.py
rename to src/PIL/CurImagePlugin.py
diff --git a/PIL/DcxImagePlugin.py b/src/PIL/DcxImagePlugin.py
similarity index 100%
rename from PIL/DcxImagePlugin.py
rename to src/PIL/DcxImagePlugin.py
diff --git a/PIL/DdsImagePlugin.py b/src/PIL/DdsImagePlugin.py
similarity index 100%
rename from PIL/DdsImagePlugin.py
rename to src/PIL/DdsImagePlugin.py
diff --git a/PIL/EpsImagePlugin.py b/src/PIL/EpsImagePlugin.py
similarity index 100%
rename from PIL/EpsImagePlugin.py
rename to src/PIL/EpsImagePlugin.py
diff --git a/PIL/ExifTags.py b/src/PIL/ExifTags.py
similarity index 100%
rename from PIL/ExifTags.py
rename to src/PIL/ExifTags.py
diff --git a/PIL/FitsStubImagePlugin.py b/src/PIL/FitsStubImagePlugin.py
similarity index 100%
rename from PIL/FitsStubImagePlugin.py
rename to src/PIL/FitsStubImagePlugin.py
diff --git a/PIL/FliImagePlugin.py b/src/PIL/FliImagePlugin.py
similarity index 100%
rename from PIL/FliImagePlugin.py
rename to src/PIL/FliImagePlugin.py
diff --git a/PIL/FontFile.py b/src/PIL/FontFile.py
similarity index 100%
rename from PIL/FontFile.py
rename to src/PIL/FontFile.py
diff --git a/PIL/FpxImagePlugin.py b/src/PIL/FpxImagePlugin.py
similarity index 100%
rename from PIL/FpxImagePlugin.py
rename to src/PIL/FpxImagePlugin.py
diff --git a/PIL/FtexImagePlugin.py b/src/PIL/FtexImagePlugin.py
similarity index 100%
rename from PIL/FtexImagePlugin.py
rename to src/PIL/FtexImagePlugin.py
diff --git a/PIL/GbrImagePlugin.py b/src/PIL/GbrImagePlugin.py
similarity index 100%
rename from PIL/GbrImagePlugin.py
rename to src/PIL/GbrImagePlugin.py
diff --git a/PIL/GdImageFile.py b/src/PIL/GdImageFile.py
similarity index 100%
rename from PIL/GdImageFile.py
rename to src/PIL/GdImageFile.py
diff --git a/PIL/GifImagePlugin.py b/src/PIL/GifImagePlugin.py
similarity index 100%
rename from PIL/GifImagePlugin.py
rename to src/PIL/GifImagePlugin.py
diff --git a/PIL/GimpGradientFile.py b/src/PIL/GimpGradientFile.py
similarity index 100%
rename from PIL/GimpGradientFile.py
rename to src/PIL/GimpGradientFile.py
diff --git a/PIL/GimpPaletteFile.py b/src/PIL/GimpPaletteFile.py
similarity index 100%
rename from PIL/GimpPaletteFile.py
rename to src/PIL/GimpPaletteFile.py
diff --git a/PIL/GribStubImagePlugin.py b/src/PIL/GribStubImagePlugin.py
similarity index 100%
rename from PIL/GribStubImagePlugin.py
rename to src/PIL/GribStubImagePlugin.py
diff --git a/PIL/Hdf5StubImagePlugin.py b/src/PIL/Hdf5StubImagePlugin.py
similarity index 100%
rename from PIL/Hdf5StubImagePlugin.py
rename to src/PIL/Hdf5StubImagePlugin.py
diff --git a/PIL/IcnsImagePlugin.py b/src/PIL/IcnsImagePlugin.py
similarity index 100%
rename from PIL/IcnsImagePlugin.py
rename to src/PIL/IcnsImagePlugin.py
diff --git a/PIL/IcoImagePlugin.py b/src/PIL/IcoImagePlugin.py
similarity index 100%
rename from PIL/IcoImagePlugin.py
rename to src/PIL/IcoImagePlugin.py
diff --git a/PIL/ImImagePlugin.py b/src/PIL/ImImagePlugin.py
similarity index 100%
rename from PIL/ImImagePlugin.py
rename to src/PIL/ImImagePlugin.py
diff --git a/PIL/Image.py b/src/PIL/Image.py
similarity index 100%
rename from PIL/Image.py
rename to src/PIL/Image.py
diff --git a/PIL/ImageChops.py b/src/PIL/ImageChops.py
similarity index 100%
rename from PIL/ImageChops.py
rename to src/PIL/ImageChops.py
diff --git a/PIL/ImageCms.py b/src/PIL/ImageCms.py
similarity index 100%
rename from PIL/ImageCms.py
rename to src/PIL/ImageCms.py
diff --git a/PIL/ImageColor.py b/src/PIL/ImageColor.py
similarity index 100%
rename from PIL/ImageColor.py
rename to src/PIL/ImageColor.py
diff --git a/PIL/ImageDraw.py b/src/PIL/ImageDraw.py
similarity index 100%
rename from PIL/ImageDraw.py
rename to src/PIL/ImageDraw.py
diff --git a/PIL/ImageDraw2.py b/src/PIL/ImageDraw2.py
similarity index 100%
rename from PIL/ImageDraw2.py
rename to src/PIL/ImageDraw2.py
diff --git a/PIL/ImageEnhance.py b/src/PIL/ImageEnhance.py
similarity index 100%
rename from PIL/ImageEnhance.py
rename to src/PIL/ImageEnhance.py
diff --git a/PIL/ImageFile.py b/src/PIL/ImageFile.py
similarity index 100%
rename from PIL/ImageFile.py
rename to src/PIL/ImageFile.py
diff --git a/PIL/ImageFilter.py b/src/PIL/ImageFilter.py
similarity index 100%
rename from PIL/ImageFilter.py
rename to src/PIL/ImageFilter.py
diff --git a/PIL/ImageFont.py b/src/PIL/ImageFont.py
similarity index 100%
rename from PIL/ImageFont.py
rename to src/PIL/ImageFont.py
diff --git a/PIL/ImageGrab.py b/src/PIL/ImageGrab.py
similarity index 100%
rename from PIL/ImageGrab.py
rename to src/PIL/ImageGrab.py
diff --git a/PIL/ImageMath.py b/src/PIL/ImageMath.py
similarity index 100%
rename from PIL/ImageMath.py
rename to src/PIL/ImageMath.py
diff --git a/PIL/ImageMode.py b/src/PIL/ImageMode.py
similarity index 100%
rename from PIL/ImageMode.py
rename to src/PIL/ImageMode.py
diff --git a/PIL/ImageMorph.py b/src/PIL/ImageMorph.py
similarity index 100%
rename from PIL/ImageMorph.py
rename to src/PIL/ImageMorph.py
diff --git a/PIL/ImageOps.py b/src/PIL/ImageOps.py
similarity index 100%
rename from PIL/ImageOps.py
rename to src/PIL/ImageOps.py
diff --git a/PIL/ImagePalette.py b/src/PIL/ImagePalette.py
similarity index 100%
rename from PIL/ImagePalette.py
rename to src/PIL/ImagePalette.py
diff --git a/PIL/ImagePath.py b/src/PIL/ImagePath.py
similarity index 100%
rename from PIL/ImagePath.py
rename to src/PIL/ImagePath.py
diff --git a/PIL/ImageQt.py b/src/PIL/ImageQt.py
similarity index 100%
rename from PIL/ImageQt.py
rename to src/PIL/ImageQt.py
diff --git a/PIL/ImageSequence.py b/src/PIL/ImageSequence.py
similarity index 100%
rename from PIL/ImageSequence.py
rename to src/PIL/ImageSequence.py
diff --git a/PIL/ImageShow.py b/src/PIL/ImageShow.py
similarity index 100%
rename from PIL/ImageShow.py
rename to src/PIL/ImageShow.py
diff --git a/PIL/ImageStat.py b/src/PIL/ImageStat.py
similarity index 100%
rename from PIL/ImageStat.py
rename to src/PIL/ImageStat.py
diff --git a/PIL/ImageTk.py b/src/PIL/ImageTk.py
similarity index 100%
rename from PIL/ImageTk.py
rename to src/PIL/ImageTk.py
diff --git a/PIL/ImageTransform.py b/src/PIL/ImageTransform.py
similarity index 100%
rename from PIL/ImageTransform.py
rename to src/PIL/ImageTransform.py
diff --git a/PIL/ImageWin.py b/src/PIL/ImageWin.py
similarity index 100%
rename from PIL/ImageWin.py
rename to src/PIL/ImageWin.py
diff --git a/PIL/ImtImagePlugin.py b/src/PIL/ImtImagePlugin.py
similarity index 100%
rename from PIL/ImtImagePlugin.py
rename to src/PIL/ImtImagePlugin.py
diff --git a/PIL/IptcImagePlugin.py b/src/PIL/IptcImagePlugin.py
similarity index 100%
rename from PIL/IptcImagePlugin.py
rename to src/PIL/IptcImagePlugin.py
diff --git a/PIL/Jpeg2KImagePlugin.py b/src/PIL/Jpeg2KImagePlugin.py
similarity index 100%
rename from PIL/Jpeg2KImagePlugin.py
rename to src/PIL/Jpeg2KImagePlugin.py
diff --git a/PIL/JpegImagePlugin.py b/src/PIL/JpegImagePlugin.py
similarity index 100%
rename from PIL/JpegImagePlugin.py
rename to src/PIL/JpegImagePlugin.py
diff --git a/PIL/JpegPresets.py b/src/PIL/JpegPresets.py
similarity index 100%
rename from PIL/JpegPresets.py
rename to src/PIL/JpegPresets.py
diff --git a/PIL/McIdasImagePlugin.py b/src/PIL/McIdasImagePlugin.py
similarity index 100%
rename from PIL/McIdasImagePlugin.py
rename to src/PIL/McIdasImagePlugin.py
diff --git a/PIL/MicImagePlugin.py b/src/PIL/MicImagePlugin.py
similarity index 100%
rename from PIL/MicImagePlugin.py
rename to src/PIL/MicImagePlugin.py
diff --git a/PIL/MpegImagePlugin.py b/src/PIL/MpegImagePlugin.py
similarity index 100%
rename from PIL/MpegImagePlugin.py
rename to src/PIL/MpegImagePlugin.py
diff --git a/PIL/MpoImagePlugin.py b/src/PIL/MpoImagePlugin.py
similarity index 100%
rename from PIL/MpoImagePlugin.py
rename to src/PIL/MpoImagePlugin.py
diff --git a/PIL/MspImagePlugin.py b/src/PIL/MspImagePlugin.py
similarity index 100%
rename from PIL/MspImagePlugin.py
rename to src/PIL/MspImagePlugin.py
diff --git a/PIL/OleFileIO.py b/src/PIL/OleFileIO.py
similarity index 100%
rename from PIL/OleFileIO.py
rename to src/PIL/OleFileIO.py
diff --git a/PIL/PSDraw.py b/src/PIL/PSDraw.py
similarity index 100%
rename from PIL/PSDraw.py
rename to src/PIL/PSDraw.py
diff --git a/PIL/PaletteFile.py b/src/PIL/PaletteFile.py
similarity index 100%
rename from PIL/PaletteFile.py
rename to src/PIL/PaletteFile.py
diff --git a/PIL/PalmImagePlugin.py b/src/PIL/PalmImagePlugin.py
similarity index 100%
rename from PIL/PalmImagePlugin.py
rename to src/PIL/PalmImagePlugin.py
diff --git a/PIL/PcdImagePlugin.py b/src/PIL/PcdImagePlugin.py
similarity index 100%
rename from PIL/PcdImagePlugin.py
rename to src/PIL/PcdImagePlugin.py
diff --git a/PIL/PcfFontFile.py b/src/PIL/PcfFontFile.py
similarity index 100%
rename from PIL/PcfFontFile.py
rename to src/PIL/PcfFontFile.py
diff --git a/PIL/PcxImagePlugin.py b/src/PIL/PcxImagePlugin.py
similarity index 100%
rename from PIL/PcxImagePlugin.py
rename to src/PIL/PcxImagePlugin.py
diff --git a/PIL/PdfImagePlugin.py b/src/PIL/PdfImagePlugin.py
similarity index 100%
rename from PIL/PdfImagePlugin.py
rename to src/PIL/PdfImagePlugin.py
diff --git a/PIL/PixarImagePlugin.py b/src/PIL/PixarImagePlugin.py
similarity index 100%
rename from PIL/PixarImagePlugin.py
rename to src/PIL/PixarImagePlugin.py
diff --git a/PIL/PngImagePlugin.py b/src/PIL/PngImagePlugin.py
similarity index 100%
rename from PIL/PngImagePlugin.py
rename to src/PIL/PngImagePlugin.py
diff --git a/PIL/PpmImagePlugin.py b/src/PIL/PpmImagePlugin.py
similarity index 100%
rename from PIL/PpmImagePlugin.py
rename to src/PIL/PpmImagePlugin.py
diff --git a/PIL/PsdImagePlugin.py b/src/PIL/PsdImagePlugin.py
similarity index 100%
rename from PIL/PsdImagePlugin.py
rename to src/PIL/PsdImagePlugin.py
diff --git a/PIL/PyAccess.py b/src/PIL/PyAccess.py
similarity index 100%
rename from PIL/PyAccess.py
rename to src/PIL/PyAccess.py
diff --git a/PIL/SgiImagePlugin.py b/src/PIL/SgiImagePlugin.py
similarity index 100%
rename from PIL/SgiImagePlugin.py
rename to src/PIL/SgiImagePlugin.py
diff --git a/PIL/SpiderImagePlugin.py b/src/PIL/SpiderImagePlugin.py
similarity index 100%
rename from PIL/SpiderImagePlugin.py
rename to src/PIL/SpiderImagePlugin.py
diff --git a/PIL/SunImagePlugin.py b/src/PIL/SunImagePlugin.py
similarity index 100%
rename from PIL/SunImagePlugin.py
rename to src/PIL/SunImagePlugin.py
diff --git a/PIL/TarIO.py b/src/PIL/TarIO.py
similarity index 100%
rename from PIL/TarIO.py
rename to src/PIL/TarIO.py
diff --git a/PIL/TgaImagePlugin.py b/src/PIL/TgaImagePlugin.py
similarity index 100%
rename from PIL/TgaImagePlugin.py
rename to src/PIL/TgaImagePlugin.py
diff --git a/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py
similarity index 100%
rename from PIL/TiffImagePlugin.py
rename to src/PIL/TiffImagePlugin.py
diff --git a/PIL/TiffTags.py b/src/PIL/TiffTags.py
similarity index 100%
rename from PIL/TiffTags.py
rename to src/PIL/TiffTags.py
diff --git a/PIL/WalImageFile.py b/src/PIL/WalImageFile.py
similarity index 100%
rename from PIL/WalImageFile.py
rename to src/PIL/WalImageFile.py
diff --git a/PIL/WebPImagePlugin.py b/src/PIL/WebPImagePlugin.py
similarity index 100%
rename from PIL/WebPImagePlugin.py
rename to src/PIL/WebPImagePlugin.py
diff --git a/PIL/WmfImagePlugin.py b/src/PIL/WmfImagePlugin.py
similarity index 100%
rename from PIL/WmfImagePlugin.py
rename to src/PIL/WmfImagePlugin.py
diff --git a/PIL/XVThumbImagePlugin.py b/src/PIL/XVThumbImagePlugin.py
similarity index 100%
rename from PIL/XVThumbImagePlugin.py
rename to src/PIL/XVThumbImagePlugin.py
diff --git a/PIL/XbmImagePlugin.py b/src/PIL/XbmImagePlugin.py
similarity index 100%
rename from PIL/XbmImagePlugin.py
rename to src/PIL/XbmImagePlugin.py
diff --git a/PIL/XpmImagePlugin.py b/src/PIL/XpmImagePlugin.py
similarity index 100%
rename from PIL/XpmImagePlugin.py
rename to src/PIL/XpmImagePlugin.py
diff --git a/PIL/__init__.py b/src/PIL/__init__.py
similarity index 100%
rename from PIL/__init__.py
rename to src/PIL/__init__.py
diff --git a/PIL/_binary.py b/src/PIL/_binary.py
similarity index 100%
rename from PIL/_binary.py
rename to src/PIL/_binary.py
diff --git a/PIL/_tkinter_finder.py b/src/PIL/_tkinter_finder.py
similarity index 100%
rename from PIL/_tkinter_finder.py
rename to src/PIL/_tkinter_finder.py
diff --git a/PIL/_util.py b/src/PIL/_util.py
similarity index 100%
rename from PIL/_util.py
rename to src/PIL/_util.py
diff --git a/PIL/features.py b/src/PIL/features.py
similarity index 100%
rename from PIL/features.py
rename to src/PIL/features.py
diff --git a/PIL/version.py b/src/PIL/version.py
similarity index 100%
rename from PIL/version.py
rename to src/PIL/version.py
diff --git a/_imaging.c b/src/_imaging.c
similarity index 100%
rename from _imaging.c
rename to src/_imaging.c
diff --git a/_imagingcms.c b/src/_imagingcms.c
similarity index 100%
rename from _imagingcms.c
rename to src/_imagingcms.c
diff --git a/_imagingft.c b/src/_imagingft.c
similarity index 100%
rename from _imagingft.c
rename to src/_imagingft.c
diff --git a/_imagingmath.c b/src/_imagingmath.c
similarity index 100%
rename from _imagingmath.c
rename to src/_imagingmath.c
diff --git a/_imagingmorph.c b/src/_imagingmorph.c
similarity index 100%
rename from _imagingmorph.c
rename to src/_imagingmorph.c
diff --git a/_imagingtk.c b/src/_imagingtk.c
similarity index 100%
rename from _imagingtk.c
rename to src/_imagingtk.c
diff --git a/_webp.c b/src/_webp.c
similarity index 100%
rename from _webp.c
rename to src/_webp.c
diff --git a/decode.c b/src/decode.c
similarity index 100%
rename from decode.c
rename to src/decode.c
diff --git a/display.c b/src/display.c
similarity index 100%
rename from display.c
rename to src/display.c
diff --git a/encode.c b/src/encode.c
similarity index 100%
rename from encode.c
rename to src/encode.c
diff --git a/libImaging/Access.c b/src/libImaging/Access.c
similarity index 100%
rename from libImaging/Access.c
rename to src/libImaging/Access.c
diff --git a/libImaging/AlphaComposite.c b/src/libImaging/AlphaComposite.c
similarity index 100%
rename from libImaging/AlphaComposite.c
rename to src/libImaging/AlphaComposite.c
diff --git a/libImaging/Bands.c b/src/libImaging/Bands.c
similarity index 100%
rename from libImaging/Bands.c
rename to src/libImaging/Bands.c
diff --git a/libImaging/BcnDecode.c b/src/libImaging/BcnDecode.c
similarity index 100%
rename from libImaging/BcnDecode.c
rename to src/libImaging/BcnDecode.c
diff --git a/libImaging/Bit.h b/src/libImaging/Bit.h
similarity index 100%
rename from libImaging/Bit.h
rename to src/libImaging/Bit.h
diff --git a/libImaging/BitDecode.c b/src/libImaging/BitDecode.c
similarity index 100%
rename from libImaging/BitDecode.c
rename to src/libImaging/BitDecode.c
diff --git a/libImaging/Blend.c b/src/libImaging/Blend.c
similarity index 100%
rename from libImaging/Blend.c
rename to src/libImaging/Blend.c
diff --git a/libImaging/BoxBlur.c b/src/libImaging/BoxBlur.c
similarity index 100%
rename from libImaging/BoxBlur.c
rename to src/libImaging/BoxBlur.c
diff --git a/libImaging/Chops.c b/src/libImaging/Chops.c
similarity index 100%
rename from libImaging/Chops.c
rename to src/libImaging/Chops.c
diff --git a/libImaging/Convert.c b/src/libImaging/Convert.c
similarity index 100%
rename from libImaging/Convert.c
rename to src/libImaging/Convert.c
diff --git a/libImaging/ConvertYCbCr.c b/src/libImaging/ConvertYCbCr.c
similarity index 100%
rename from libImaging/ConvertYCbCr.c
rename to src/libImaging/ConvertYCbCr.c
diff --git a/libImaging/Copy.c b/src/libImaging/Copy.c
similarity index 100%
rename from libImaging/Copy.c
rename to src/libImaging/Copy.c
diff --git a/libImaging/Crc32.c b/src/libImaging/Crc32.c
similarity index 100%
rename from libImaging/Crc32.c
rename to src/libImaging/Crc32.c
diff --git a/libImaging/Crop.c b/src/libImaging/Crop.c
similarity index 100%
rename from libImaging/Crop.c
rename to src/libImaging/Crop.c
diff --git a/libImaging/Dib.c b/src/libImaging/Dib.c
similarity index 100%
rename from libImaging/Dib.c
rename to src/libImaging/Dib.c
diff --git a/libImaging/Draw.c b/src/libImaging/Draw.c
similarity index 100%
rename from libImaging/Draw.c
rename to src/libImaging/Draw.c
diff --git a/libImaging/Effects.c b/src/libImaging/Effects.c
similarity index 100%
rename from libImaging/Effects.c
rename to src/libImaging/Effects.c
diff --git a/libImaging/EpsEncode.c b/src/libImaging/EpsEncode.c
similarity index 100%
rename from libImaging/EpsEncode.c
rename to src/libImaging/EpsEncode.c
diff --git a/libImaging/Except.c b/src/libImaging/Except.c
similarity index 100%
rename from libImaging/Except.c
rename to src/libImaging/Except.c
diff --git a/libImaging/File.c b/src/libImaging/File.c
similarity index 100%
rename from libImaging/File.c
rename to src/libImaging/File.c
diff --git a/libImaging/Fill.c b/src/libImaging/Fill.c
similarity index 100%
rename from libImaging/Fill.c
rename to src/libImaging/Fill.c
diff --git a/libImaging/Filter.c b/src/libImaging/Filter.c
similarity index 100%
rename from libImaging/Filter.c
rename to src/libImaging/Filter.c
diff --git a/libImaging/FliDecode.c b/src/libImaging/FliDecode.c
similarity index 100%
rename from libImaging/FliDecode.c
rename to src/libImaging/FliDecode.c
diff --git a/libImaging/Geometry.c b/src/libImaging/Geometry.c
similarity index 100%
rename from libImaging/Geometry.c
rename to src/libImaging/Geometry.c
diff --git a/libImaging/GetBBox.c b/src/libImaging/GetBBox.c
similarity index 100%
rename from libImaging/GetBBox.c
rename to src/libImaging/GetBBox.c
diff --git a/libImaging/Gif.h b/src/libImaging/Gif.h
similarity index 100%
rename from libImaging/Gif.h
rename to src/libImaging/Gif.h
diff --git a/libImaging/GifDecode.c b/src/libImaging/GifDecode.c
similarity index 100%
rename from libImaging/GifDecode.c
rename to src/libImaging/GifDecode.c
diff --git a/libImaging/GifEncode.c b/src/libImaging/GifEncode.c
similarity index 100%
rename from libImaging/GifEncode.c
rename to src/libImaging/GifEncode.c
diff --git a/libImaging/HexDecode.c b/src/libImaging/HexDecode.c
similarity index 100%
rename from libImaging/HexDecode.c
rename to src/libImaging/HexDecode.c
diff --git a/libImaging/Histo.c b/src/libImaging/Histo.c
similarity index 100%
rename from libImaging/Histo.c
rename to src/libImaging/Histo.c
diff --git a/libImaging/ImDib.h b/src/libImaging/ImDib.h
similarity index 100%
rename from libImaging/ImDib.h
rename to src/libImaging/ImDib.h
diff --git a/libImaging/ImPlatform.h b/src/libImaging/ImPlatform.h
similarity index 100%
rename from libImaging/ImPlatform.h
rename to src/libImaging/ImPlatform.h
diff --git a/libImaging/Imaging.h b/src/libImaging/Imaging.h
similarity index 100%
rename from libImaging/Imaging.h
rename to src/libImaging/Imaging.h
diff --git a/libImaging/ImagingUtils.h b/src/libImaging/ImagingUtils.h
similarity index 100%
rename from libImaging/ImagingUtils.h
rename to src/libImaging/ImagingUtils.h
diff --git a/libImaging/Jpeg.h b/src/libImaging/Jpeg.h
similarity index 100%
rename from libImaging/Jpeg.h
rename to src/libImaging/Jpeg.h
diff --git a/libImaging/Jpeg2K.h b/src/libImaging/Jpeg2K.h
similarity index 100%
rename from libImaging/Jpeg2K.h
rename to src/libImaging/Jpeg2K.h
diff --git a/libImaging/Jpeg2KDecode.c b/src/libImaging/Jpeg2KDecode.c
similarity index 100%
rename from libImaging/Jpeg2KDecode.c
rename to src/libImaging/Jpeg2KDecode.c
diff --git a/libImaging/Jpeg2KEncode.c b/src/libImaging/Jpeg2KEncode.c
similarity index 100%
rename from libImaging/Jpeg2KEncode.c
rename to src/libImaging/Jpeg2KEncode.c
diff --git a/libImaging/JpegDecode.c b/src/libImaging/JpegDecode.c
similarity index 100%
rename from libImaging/JpegDecode.c
rename to src/libImaging/JpegDecode.c
diff --git a/libImaging/JpegEncode.c b/src/libImaging/JpegEncode.c
similarity index 100%
rename from libImaging/JpegEncode.c
rename to src/libImaging/JpegEncode.c
diff --git a/libImaging/Matrix.c b/src/libImaging/Matrix.c
similarity index 100%
rename from libImaging/Matrix.c
rename to src/libImaging/Matrix.c
diff --git a/libImaging/ModeFilter.c b/src/libImaging/ModeFilter.c
similarity index 100%
rename from libImaging/ModeFilter.c
rename to src/libImaging/ModeFilter.c
diff --git a/libImaging/Negative.c b/src/libImaging/Negative.c
similarity index 100%
rename from libImaging/Negative.c
rename to src/libImaging/Negative.c
diff --git a/libImaging/Offset.c b/src/libImaging/Offset.c
similarity index 100%
rename from libImaging/Offset.c
rename to src/libImaging/Offset.c
diff --git a/libImaging/Pack.c b/src/libImaging/Pack.c
similarity index 100%
rename from libImaging/Pack.c
rename to src/libImaging/Pack.c
diff --git a/libImaging/PackDecode.c b/src/libImaging/PackDecode.c
similarity index 100%
rename from libImaging/PackDecode.c
rename to src/libImaging/PackDecode.c
diff --git a/libImaging/Palette.c b/src/libImaging/Palette.c
similarity index 100%
rename from libImaging/Palette.c
rename to src/libImaging/Palette.c
diff --git a/libImaging/Paste.c b/src/libImaging/Paste.c
similarity index 100%
rename from libImaging/Paste.c
rename to src/libImaging/Paste.c
diff --git a/libImaging/PcdDecode.c b/src/libImaging/PcdDecode.c
similarity index 100%
rename from libImaging/PcdDecode.c
rename to src/libImaging/PcdDecode.c
diff --git a/libImaging/PcxDecode.c b/src/libImaging/PcxDecode.c
similarity index 100%
rename from libImaging/PcxDecode.c
rename to src/libImaging/PcxDecode.c
diff --git a/libImaging/PcxEncode.c b/src/libImaging/PcxEncode.c
similarity index 100%
rename from libImaging/PcxEncode.c
rename to src/libImaging/PcxEncode.c
diff --git a/libImaging/Point.c b/src/libImaging/Point.c
similarity index 100%
rename from libImaging/Point.c
rename to src/libImaging/Point.c
diff --git a/libImaging/Quant.c b/src/libImaging/Quant.c
similarity index 100%
rename from libImaging/Quant.c
rename to src/libImaging/Quant.c
diff --git a/libImaging/QuantHash.c b/src/libImaging/QuantHash.c
similarity index 100%
rename from libImaging/QuantHash.c
rename to src/libImaging/QuantHash.c
diff --git a/libImaging/QuantHash.h b/src/libImaging/QuantHash.h
similarity index 100%
rename from libImaging/QuantHash.h
rename to src/libImaging/QuantHash.h
diff --git a/libImaging/QuantHeap.c b/src/libImaging/QuantHeap.c
similarity index 100%
rename from libImaging/QuantHeap.c
rename to src/libImaging/QuantHeap.c
diff --git a/libImaging/QuantHeap.h b/src/libImaging/QuantHeap.h
similarity index 100%
rename from libImaging/QuantHeap.h
rename to src/libImaging/QuantHeap.h
diff --git a/libImaging/QuantOctree.c b/src/libImaging/QuantOctree.c
similarity index 100%
rename from libImaging/QuantOctree.c
rename to src/libImaging/QuantOctree.c
diff --git a/libImaging/QuantOctree.h b/src/libImaging/QuantOctree.h
similarity index 100%
rename from libImaging/QuantOctree.h
rename to src/libImaging/QuantOctree.h
diff --git a/libImaging/QuantPngQuant.c b/src/libImaging/QuantPngQuant.c
similarity index 100%
rename from libImaging/QuantPngQuant.c
rename to src/libImaging/QuantPngQuant.c
diff --git a/libImaging/QuantPngQuant.h b/src/libImaging/QuantPngQuant.h
similarity index 100%
rename from libImaging/QuantPngQuant.h
rename to src/libImaging/QuantPngQuant.h
diff --git a/libImaging/QuantTypes.h b/src/libImaging/QuantTypes.h
similarity index 100%
rename from libImaging/QuantTypes.h
rename to src/libImaging/QuantTypes.h
diff --git a/libImaging/RankFilter.c b/src/libImaging/RankFilter.c
similarity index 100%
rename from libImaging/RankFilter.c
rename to src/libImaging/RankFilter.c
diff --git a/libImaging/Raw.h b/src/libImaging/Raw.h
similarity index 100%
rename from libImaging/Raw.h
rename to src/libImaging/Raw.h
diff --git a/libImaging/RawDecode.c b/src/libImaging/RawDecode.c
similarity index 100%
rename from libImaging/RawDecode.c
rename to src/libImaging/RawDecode.c
diff --git a/libImaging/RawEncode.c b/src/libImaging/RawEncode.c
similarity index 100%
rename from libImaging/RawEncode.c
rename to src/libImaging/RawEncode.c
diff --git a/libImaging/Resample.c b/src/libImaging/Resample.c
similarity index 100%
rename from libImaging/Resample.c
rename to src/libImaging/Resample.c
diff --git a/libImaging/Sgi.h b/src/libImaging/Sgi.h
similarity index 100%
rename from libImaging/Sgi.h
rename to src/libImaging/Sgi.h
diff --git a/libImaging/SgiRleDecode.c b/src/libImaging/SgiRleDecode.c
similarity index 100%
rename from libImaging/SgiRleDecode.c
rename to src/libImaging/SgiRleDecode.c
diff --git a/libImaging/Storage.c b/src/libImaging/Storage.c
similarity index 100%
rename from libImaging/Storage.c
rename to src/libImaging/Storage.c
diff --git a/libImaging/SunRleDecode.c b/src/libImaging/SunRleDecode.c
similarity index 100%
rename from libImaging/SunRleDecode.c
rename to src/libImaging/SunRleDecode.c
diff --git a/libImaging/TgaRleDecode.c b/src/libImaging/TgaRleDecode.c
similarity index 100%
rename from libImaging/TgaRleDecode.c
rename to src/libImaging/TgaRleDecode.c
diff --git a/libImaging/TiffDecode.c b/src/libImaging/TiffDecode.c
similarity index 100%
rename from libImaging/TiffDecode.c
rename to src/libImaging/TiffDecode.c
diff --git a/libImaging/TiffDecode.h b/src/libImaging/TiffDecode.h
similarity index 100%
rename from libImaging/TiffDecode.h
rename to src/libImaging/TiffDecode.h
diff --git a/libImaging/Unpack.c b/src/libImaging/Unpack.c
similarity index 100%
rename from libImaging/Unpack.c
rename to src/libImaging/Unpack.c
diff --git a/libImaging/UnpackYCC.c b/src/libImaging/UnpackYCC.c
similarity index 100%
rename from libImaging/UnpackYCC.c
rename to src/libImaging/UnpackYCC.c
diff --git a/libImaging/UnsharpMask.c b/src/libImaging/UnsharpMask.c
similarity index 100%
rename from libImaging/UnsharpMask.c
rename to src/libImaging/UnsharpMask.c
diff --git a/libImaging/XbmDecode.c b/src/libImaging/XbmDecode.c
similarity index 100%
rename from libImaging/XbmDecode.c
rename to src/libImaging/XbmDecode.c
diff --git a/libImaging/XbmEncode.c b/src/libImaging/XbmEncode.c
similarity index 100%
rename from libImaging/XbmEncode.c
rename to src/libImaging/XbmEncode.c
diff --git a/libImaging/Zip.h b/src/libImaging/Zip.h
similarity index 100%
rename from libImaging/Zip.h
rename to src/libImaging/Zip.h
diff --git a/libImaging/ZipDecode.c b/src/libImaging/ZipDecode.c
similarity index 100%
rename from libImaging/ZipDecode.c
rename to src/libImaging/ZipDecode.c
diff --git a/libImaging/ZipEncode.c b/src/libImaging/ZipEncode.c
similarity index 100%
rename from libImaging/ZipEncode.c
rename to src/libImaging/ZipEncode.c
diff --git a/libImaging/codec_fd.c b/src/libImaging/codec_fd.c
similarity index 100%
rename from libImaging/codec_fd.c
rename to src/libImaging/codec_fd.c
diff --git a/map.c b/src/map.c
similarity index 100%
rename from map.c
rename to src/map.c
diff --git a/outline.c b/src/outline.c
similarity index 100%
rename from outline.c
rename to src/outline.c
diff --git a/path.c b/src/path.c
similarity index 100%
rename from path.c
rename to src/path.c
diff --git a/py3.h b/src/py3.h
similarity index 100%
rename from py3.h
rename to src/py3.h