diff --git a/tier1/kimageformats/CMakeLists.txt b/CMakeLists.txt
similarity index 100%
rename from tier1/kimageformats/CMakeLists.txt
rename to CMakeLists.txt
diff --git a/tier1/kimageformats/COPYING.LIB b/COPYING.LIB
similarity index 100%
rename from tier1/kimageformats/COPYING.LIB
rename to COPYING.LIB
diff --git a/tier1/kimageformats/Mainpage.dox b/Mainpage.dox
similarity index 100%
rename from tier1/kimageformats/Mainpage.dox
rename to Mainpage.dox
diff --git a/tier1/kimageformats/cmake/FindOpenEXR.cmake b/cmake/FindOpenEXR.cmake
similarity index 100%
rename from tier1/kimageformats/cmake/FindOpenEXR.cmake
rename to cmake/FindOpenEXR.cmake
diff --git a/tier1/kimageformats/src/CMakeLists.txt b/src/CMakeLists.txt
similarity index 100%
rename from tier1/kimageformats/src/CMakeLists.txt
rename to src/CMakeLists.txt
diff --git a/tier1/kimageformats/src/imageformats/AUTHORS b/src/imageformats/AUTHORS
similarity index 100%
rename from tier1/kimageformats/src/imageformats/AUTHORS
rename to src/imageformats/AUTHORS
diff --git a/tier1/kimageformats/src/imageformats/CMakeLists.txt b/src/imageformats/CMakeLists.txt
similarity index 100%
rename from tier1/kimageformats/src/imageformats/CMakeLists.txt
rename to src/imageformats/CMakeLists.txt
diff --git a/tier1/kimageformats/src/imageformats/README b/src/imageformats/README
similarity index 100%
rename from tier1/kimageformats/src/imageformats/README
rename to src/imageformats/README
diff --git a/tier1/kimageformats/src/imageformats/config-kimgio.h.cmake b/src/imageformats/config-kimgio.h.cmake
similarity index 100%
rename from tier1/kimageformats/src/imageformats/config-kimgio.h.cmake
rename to src/imageformats/config-kimgio.h.cmake
diff --git a/tier1/kimageformats/src/imageformats/dds.cpp b/src/imageformats/dds.cpp
similarity index 100%
rename from tier1/kimageformats/src/imageformats/dds.cpp
rename to src/imageformats/dds.cpp
diff --git a/tier1/kimageformats/src/imageformats/dds.desktop b/src/imageformats/dds.desktop
similarity index 100%
rename from tier1/kimageformats/src/imageformats/dds.desktop
rename to src/imageformats/dds.desktop
diff --git a/tier1/kimageformats/src/imageformats/dds.h b/src/imageformats/dds.h
similarity index 100%
rename from tier1/kimageformats/src/imageformats/dds.h
rename to src/imageformats/dds.h
diff --git a/tier1/kimageformats/src/imageformats/dds.json b/src/imageformats/dds.json
similarity index 100%
rename from tier1/kimageformats/src/imageformats/dds.json
rename to src/imageformats/dds.json
diff --git a/tier1/kimageformats/src/imageformats/eps.cpp b/src/imageformats/eps.cpp
similarity index 100%
rename from tier1/kimageformats/src/imageformats/eps.cpp
rename to src/imageformats/eps.cpp
diff --git a/tier1/kimageformats/src/imageformats/eps.desktop b/src/imageformats/eps.desktop
similarity index 100%
rename from tier1/kimageformats/src/imageformats/eps.desktop
rename to src/imageformats/eps.desktop
diff --git a/tier1/kimageformats/src/imageformats/eps.h b/src/imageformats/eps.h
similarity index 100%
rename from tier1/kimageformats/src/imageformats/eps.h
rename to src/imageformats/eps.h
diff --git a/tier1/kimageformats/src/imageformats/eps.json b/src/imageformats/eps.json
similarity index 100%
rename from tier1/kimageformats/src/imageformats/eps.json
rename to src/imageformats/eps.json
diff --git a/tier1/kimageformats/src/imageformats/exr.cpp b/src/imageformats/exr.cpp
similarity index 100%
rename from tier1/kimageformats/src/imageformats/exr.cpp
rename to src/imageformats/exr.cpp
diff --git a/tier1/kimageformats/src/imageformats/exr.desktop b/src/imageformats/exr.desktop
similarity index 100%
rename from tier1/kimageformats/src/imageformats/exr.desktop
rename to src/imageformats/exr.desktop
diff --git a/tier1/kimageformats/src/imageformats/exr.h b/src/imageformats/exr.h
similarity index 100%
rename from tier1/kimageformats/src/imageformats/exr.h
rename to src/imageformats/exr.h
diff --git a/tier1/kimageformats/src/imageformats/exr.json b/src/imageformats/exr.json
similarity index 100%
rename from tier1/kimageformats/src/imageformats/exr.json
rename to src/imageformats/exr.json
diff --git a/tier1/kimageformats/src/imageformats/gimp.h b/src/imageformats/gimp.h
similarity index 100%
rename from tier1/kimageformats/src/imageformats/gimp.h
rename to src/imageformats/gimp.h
diff --git a/tier1/kimageformats/src/imageformats/hdr.cpp b/src/imageformats/hdr.cpp
similarity index 100%
rename from tier1/kimageformats/src/imageformats/hdr.cpp
rename to src/imageformats/hdr.cpp
diff --git a/tier1/kimageformats/src/imageformats/hdr.desktop b/src/imageformats/hdr.desktop
similarity index 100%
rename from tier1/kimageformats/src/imageformats/hdr.desktop
rename to src/imageformats/hdr.desktop
diff --git a/tier1/kimageformats/src/imageformats/hdr.h b/src/imageformats/hdr.h
similarity index 100%
rename from tier1/kimageformats/src/imageformats/hdr.h
rename to src/imageformats/hdr.h
diff --git a/tier1/kimageformats/src/imageformats/jp2.cpp b/src/imageformats/jp2.cpp
similarity index 100%
rename from tier1/kimageformats/src/imageformats/jp2.cpp
rename to src/imageformats/jp2.cpp
diff --git a/tier1/kimageformats/src/imageformats/jp2.desktop b/src/imageformats/jp2.desktop
similarity index 100%
rename from tier1/kimageformats/src/imageformats/jp2.desktop
rename to src/imageformats/jp2.desktop
diff --git a/tier1/kimageformats/src/imageformats/jp2.h b/src/imageformats/jp2.h
similarity index 100%
rename from tier1/kimageformats/src/imageformats/jp2.h
rename to src/imageformats/jp2.h
diff --git a/tier1/kimageformats/src/imageformats/jp2.json b/src/imageformats/jp2.json
similarity index 100%
rename from tier1/kimageformats/src/imageformats/jp2.json
rename to src/imageformats/jp2.json
diff --git a/tier1/kimageformats/src/imageformats/pcx.cpp b/src/imageformats/pcx.cpp
similarity index 100%
rename from tier1/kimageformats/src/imageformats/pcx.cpp
rename to src/imageformats/pcx.cpp
diff --git a/tier1/kimageformats/src/imageformats/pcx.desktop b/src/imageformats/pcx.desktop
similarity index 100%
rename from tier1/kimageformats/src/imageformats/pcx.desktop
rename to src/imageformats/pcx.desktop
diff --git a/tier1/kimageformats/src/imageformats/pcx.h b/src/imageformats/pcx.h
similarity index 100%
rename from tier1/kimageformats/src/imageformats/pcx.h
rename to src/imageformats/pcx.h
diff --git a/tier1/kimageformats/src/imageformats/pcx.json b/src/imageformats/pcx.json
similarity index 100%
rename from tier1/kimageformats/src/imageformats/pcx.json
rename to src/imageformats/pcx.json
diff --git a/tier1/kimageformats/src/imageformats/pic.cpp b/src/imageformats/pic.cpp
similarity index 100%
rename from tier1/kimageformats/src/imageformats/pic.cpp
rename to src/imageformats/pic.cpp
diff --git a/tier1/kimageformats/src/imageformats/pic.desktop b/src/imageformats/pic.desktop
similarity index 100%
rename from tier1/kimageformats/src/imageformats/pic.desktop
rename to src/imageformats/pic.desktop
diff --git a/tier1/kimageformats/src/imageformats/pic.h b/src/imageformats/pic.h
similarity index 100%
rename from tier1/kimageformats/src/imageformats/pic.h
rename to src/imageformats/pic.h
diff --git a/tier1/kimageformats/src/imageformats/pic.json b/src/imageformats/pic.json
similarity index 100%
rename from tier1/kimageformats/src/imageformats/pic.json
rename to src/imageformats/pic.json
diff --git a/tier1/kimageformats/src/imageformats/pic_read.cpp b/src/imageformats/pic_read.cpp
similarity index 100%
rename from tier1/kimageformats/src/imageformats/pic_read.cpp
rename to src/imageformats/pic_read.cpp
diff --git a/tier1/kimageformats/src/imageformats/pic_rw.h b/src/imageformats/pic_rw.h
similarity index 100%
rename from tier1/kimageformats/src/imageformats/pic_rw.h
rename to src/imageformats/pic_rw.h
diff --git a/tier1/kimageformats/src/imageformats/pic_write.cpp b/src/imageformats/pic_write.cpp
similarity index 100%
rename from tier1/kimageformats/src/imageformats/pic_write.cpp
rename to src/imageformats/pic_write.cpp
diff --git a/tier1/kimageformats/src/imageformats/pnm.desktop b/src/imageformats/pnm.desktop
similarity index 100%
rename from tier1/kimageformats/src/imageformats/pnm.desktop
rename to src/imageformats/pnm.desktop
diff --git a/tier1/kimageformats/src/imageformats/psd.cpp b/src/imageformats/psd.cpp
similarity index 100%
rename from tier1/kimageformats/src/imageformats/psd.cpp
rename to src/imageformats/psd.cpp
diff --git a/tier1/kimageformats/src/imageformats/psd.desktop b/src/imageformats/psd.desktop
similarity index 100%
rename from tier1/kimageformats/src/imageformats/psd.desktop
rename to src/imageformats/psd.desktop
diff --git a/tier1/kimageformats/src/imageformats/psd.h b/src/imageformats/psd.h
similarity index 100%
rename from tier1/kimageformats/src/imageformats/psd.h
rename to src/imageformats/psd.h
diff --git a/tier1/kimageformats/src/imageformats/psd.json b/src/imageformats/psd.json
similarity index 100%
rename from tier1/kimageformats/src/imageformats/psd.json
rename to src/imageformats/psd.json
diff --git a/tier1/kimageformats/src/imageformats/ras.cpp b/src/imageformats/ras.cpp
similarity index 100%
rename from tier1/kimageformats/src/imageformats/ras.cpp
rename to src/imageformats/ras.cpp
diff --git a/tier1/kimageformats/src/imageformats/ras.desktop b/src/imageformats/ras.desktop
similarity index 100%
rename from tier1/kimageformats/src/imageformats/ras.desktop
rename to src/imageformats/ras.desktop
diff --git a/tier1/kimageformats/src/imageformats/ras.h b/src/imageformats/ras.h
similarity index 100%
rename from tier1/kimageformats/src/imageformats/ras.h
rename to src/imageformats/ras.h
diff --git a/tier1/kimageformats/src/imageformats/ras.json b/src/imageformats/ras.json
similarity index 100%
rename from tier1/kimageformats/src/imageformats/ras.json
rename to src/imageformats/ras.json
diff --git a/tier1/kimageformats/src/imageformats/rgb.cpp b/src/imageformats/rgb.cpp
similarity index 100%
rename from tier1/kimageformats/src/imageformats/rgb.cpp
rename to src/imageformats/rgb.cpp
diff --git a/tier1/kimageformats/src/imageformats/rgb.desktop b/src/imageformats/rgb.desktop
similarity index 100%
rename from tier1/kimageformats/src/imageformats/rgb.desktop
rename to src/imageformats/rgb.desktop
diff --git a/tier1/kimageformats/src/imageformats/rgb.h b/src/imageformats/rgb.h
similarity index 100%
rename from tier1/kimageformats/src/imageformats/rgb.h
rename to src/imageformats/rgb.h
diff --git a/tier1/kimageformats/src/imageformats/rgb.json b/src/imageformats/rgb.json
similarity index 100%
rename from tier1/kimageformats/src/imageformats/rgb.json
rename to src/imageformats/rgb.json
diff --git a/tier1/kimageformats/src/imageformats/tga.cpp b/src/imageformats/tga.cpp
similarity index 100%
rename from tier1/kimageformats/src/imageformats/tga.cpp
rename to src/imageformats/tga.cpp
diff --git a/tier1/kimageformats/src/imageformats/tga.desktop b/src/imageformats/tga.desktop
similarity index 100%
rename from tier1/kimageformats/src/imageformats/tga.desktop
rename to src/imageformats/tga.desktop
diff --git a/tier1/kimageformats/src/imageformats/tga.h b/src/imageformats/tga.h
similarity index 100%
rename from tier1/kimageformats/src/imageformats/tga.h
rename to src/imageformats/tga.h
diff --git a/tier1/kimageformats/src/imageformats/tga.json b/src/imageformats/tga.json
similarity index 100%
rename from tier1/kimageformats/src/imageformats/tga.json
rename to src/imageformats/tga.json
diff --git a/tier1/kimageformats/src/imageformats/xcf.cpp b/src/imageformats/xcf.cpp
similarity index 100%
rename from tier1/kimageformats/src/imageformats/xcf.cpp
rename to src/imageformats/xcf.cpp
diff --git a/tier1/kimageformats/src/imageformats/xcf.desktop b/src/imageformats/xcf.desktop
similarity index 100%
rename from tier1/kimageformats/src/imageformats/xcf.desktop
rename to src/imageformats/xcf.desktop
diff --git a/tier1/kimageformats/src/imageformats/xcf.h b/src/imageformats/xcf.h
similarity index 100%
rename from tier1/kimageformats/src/imageformats/xcf.h
rename to src/imageformats/xcf.h
diff --git a/tier1/kimageformats/src/imageformats/xcf.json b/src/imageformats/xcf.json
similarity index 100%
rename from tier1/kimageformats/src/imageformats/xcf.json
rename to src/imageformats/xcf.json
diff --git a/tier1/kimageformats/src/imageformats/xv.desktop b/src/imageformats/xv.desktop
similarity index 100%
rename from tier1/kimageformats/src/imageformats/xv.desktop
rename to src/imageformats/xv.desktop
diff --git a/tier1/kimageformats/src/imageformats/xview.cpp b/src/imageformats/xview.cpp
similarity index 100%
rename from tier1/kimageformats/src/imageformats/xview.cpp
rename to src/imageformats/xview.cpp
diff --git a/tier1/kimageformats/src/imageformats/xview.h b/src/imageformats/xview.h
similarity index 100%
rename from tier1/kimageformats/src/imageformats/xview.h
rename to src/imageformats/xview.h
diff --git a/tier1/kimageformats/src/imageformats/xview.json b/src/imageformats/xview.json
similarity index 100%
rename from tier1/kimageformats/src/imageformats/xview.json
rename to src/imageformats/xview.json
diff --git a/tier1/kimageformats/tests/CMakeLists.txt b/tests/CMakeLists.txt
similarity index 100%
rename from tier1/kimageformats/tests/CMakeLists.txt
rename to tests/CMakeLists.txt
diff --git a/tier1/kimageformats/tests/imageconverter.cpp b/tests/imageconverter.cpp
similarity index 100%
rename from tier1/kimageformats/tests/imageconverter.cpp
rename to tests/imageconverter.cpp