diff --git a/CMakeLists.txt b/CMakeLists.txt
index f779df55..ecf67098 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,7 +42,7 @@ set(OPENJPEG_LIBRARY_PROPERTIES
 # --------------------------------------------------------------------------
 # Path to additional CMake modules
 set(CMAKE_MODULE_PATH
-    ${CMAKE_SOURCE_DIR}/CMake
+    ${CMAKE_SOURCE_DIR}/cmake
     ${CMAKE_MODULE_PATH})
 
 # --------------------------------------------------------------------------
@@ -121,7 +121,7 @@ TEST_BIG_ENDIAN(OPJ_BIG_ENDIAN)
 #-----------------------------------------------------------------------------
 # Setup file for setting custom ctest vars
 configure_file(
-  ${CMAKE_SOURCE_DIR}/CMake/CTestCustom.cmake.in
+  ${CMAKE_SOURCE_DIR}/cmake/CTestCustom.cmake.in
   ${CMAKE_BINARY_DIR}/CTestCustom.cmake
   @ONLY
   )
@@ -185,7 +185,7 @@ OPJ_TEST_LARGE_FILES(OPJ_HAVE_LARGEFILES)
 #-----------------------------------------------------------------------------
 # Build Library
 include_directories(BEFORE ${OPENJPEG_BINARY_DIR})
-add_subdirectory(libopenjpeg)
+add_subdirectory(src)
 
 #-----------------------------------------------------------------------------
 # Build Applications
@@ -206,7 +206,7 @@ if(BUILD_CODEC OR BUILD_MJ2)
   # ON: 3rd party libs will ALWAYS be build, and used
   option(BUILD_THIRDPARTY "Build the thirdparty executables if it is needed" OFF)
   add_subdirectory(thirdparty)
-  add_subdirectory(applications)
+  add_subdirectory(src/bin)
 endif ()
 
 include(CheckTypeSize)
@@ -225,7 +225,7 @@ install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/opj_config.h
 # Build DOCUMENTATION (not in ALL target and only if Doxygen is found)
 option(BUILD_DOC "Build the HTML documentation (with doxygen if available)." OFF)
 if(BUILD_DOC)
-    add_subdirectory(doc)
+  add_subdirectory(doc)
 endif()
 
 #-----------------------------------------------------------------------------
@@ -256,7 +256,7 @@ endif()
 #-----------------------------------------------------------------------------
 # install all targets referenced as OPENJPEGTargets
 install(EXPORT OpenJPEGTargets DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR})
-configure_file( ${OPENJPEG_SOURCE_DIR}/CMake/OpenJPEGConfig.cmake.in
+configure_file( ${OPENJPEG_SOURCE_DIR}/cmake/OpenJPEGConfig.cmake.in
   ${OPENJPEG_BINARY_DIR}/OpenJPEGConfig.cmake
   @ONLY
 )
@@ -271,4 +271,4 @@ if(EXISTS ${OPENJPEG_SOURCE_DIR}/CHANGES)
 endif()
 install(FILES LICENSE DESTINATION ${OPENJPEG_INSTALL_DOC_DIR})
 
-include (CMake/OpenJPEGCPack.cmake)
+include (cmake/OpenJPEGCPack.cmake)
diff --git a/CMake/CTestCustom.cmake.in b/cmake/CTestCustom.cmake.in
similarity index 100%
rename from CMake/CTestCustom.cmake.in
rename to cmake/CTestCustom.cmake.in
diff --git a/CMake/FindCPPCHECK.cmake b/cmake/FindCPPCHECK.cmake
similarity index 100%
rename from CMake/FindCPPCHECK.cmake
rename to cmake/FindCPPCHECK.cmake
diff --git a/CMake/FindFCGI.cmake b/cmake/FindFCGI.cmake
similarity index 100%
rename from CMake/FindFCGI.cmake
rename to cmake/FindFCGI.cmake
diff --git a/CMake/FindKAKADU.cmake b/cmake/FindKAKADU.cmake
similarity index 100%
rename from CMake/FindKAKADU.cmake
rename to cmake/FindKAKADU.cmake
diff --git a/CMake/FindLCMS.cmake b/cmake/FindLCMS.cmake
similarity index 100%
rename from CMake/FindLCMS.cmake
rename to cmake/FindLCMS.cmake
diff --git a/CMake/FindLCMS2.cmake b/cmake/FindLCMS2.cmake
similarity index 100%
rename from CMake/FindLCMS2.cmake
rename to cmake/FindLCMS2.cmake
diff --git a/CMake/JPIPTestDriver.cmake b/cmake/JPIPTestDriver.cmake
similarity index 100%
rename from CMake/JPIPTestDriver.cmake
rename to cmake/JPIPTestDriver.cmake
diff --git a/CMake/OpenJPEGCPack.cmake b/cmake/OpenJPEGCPack.cmake
similarity index 100%
rename from CMake/OpenJPEGCPack.cmake
rename to cmake/OpenJPEGCPack.cmake
diff --git a/CMake/OpenJPEGConfig.cmake.in b/cmake/OpenJPEGConfig.cmake.in
similarity index 100%
rename from CMake/OpenJPEGConfig.cmake.in
rename to cmake/OpenJPEGConfig.cmake.in
diff --git a/CMake/TestFileOffsetBits.c b/cmake/TestFileOffsetBits.c
similarity index 100%
rename from CMake/TestFileOffsetBits.c
rename to cmake/TestFileOffsetBits.c
diff --git a/CMake/TestLargeFiles.c.cmake.in b/cmake/TestLargeFiles.c.cmake.in
similarity index 100%
rename from CMake/TestLargeFiles.c.cmake.in
rename to cmake/TestLargeFiles.c.cmake.in
diff --git a/CMake/TestLargeFiles.cmake b/cmake/TestLargeFiles.cmake
similarity index 93%
rename from CMake/TestLargeFiles.cmake
rename to cmake/TestLargeFiles.cmake
index d22782b4..ffef84f5 100644
--- a/CMake/TestLargeFiles.cmake
+++ b/cmake/TestLargeFiles.cmake
@@ -27,7 +27,7 @@ macro(OPJ_TEST_LARGE_FILES VARIABLE)
 
         # First check without any special flags
         try_compile(FILE64_OK "${PROJECT_BINARY_DIR}"
-                    "${PROJECT_SOURCE_DIR}/CMake/TestFileOffsetBits.c")
+                    "${PROJECT_SOURCE_DIR}/cmake/TestFileOffsetBits.c")
         if(FILE64_OK)
           message(STATUS "Checking for 64-bit off_t - present")
        	endif()
@@ -35,7 +35,7 @@ macro(OPJ_TEST_LARGE_FILES VARIABLE)
         if(NOT FILE64_OK)
             # Test with _FILE_OFFSET_BITS=64
             try_compile(FILE64_OK "${PROJECT_BINARY_DIR}"
-                        "${PROJECT_SOURCE_DIR}/CMake/TestFileOffsetBits.c"
+                        "${PROJECT_SOURCE_DIR}/cmake/TestFileOffsetBits.c"
                         COMPILE_DEFINITIONS "-D_FILE_OFFSET_BITS=64" )
             if(FILE64_OK)
                 message(STATUS "Checking for 64-bit off_t - present with _FILE_OFFSET_BITS=64")
@@ -46,7 +46,7 @@ macro(OPJ_TEST_LARGE_FILES VARIABLE)
         if(NOT FILE64_OK)
             # Test with _LARGE_FILES
             try_compile(FILE64_OK "${PROJECT_BINARY_DIR}"
-                        "${PROJECT_SOURCE_DIR}/CMake/TestFileOffsetBits.c"
+                        "${PROJECT_SOURCE_DIR}/cmake/TestFileOffsetBits.c"
                         COMPILE_DEFINITIONS "-D_LARGE_FILES" )
             if(FILE64_OK)
                 message(STATUS "Checking for 64-bit off_t - present with _LARGE_FILES")
@@ -57,7 +57,7 @@ macro(OPJ_TEST_LARGE_FILES VARIABLE)
         if(NOT FILE64_OK)
             # Test with _LARGEFILE_SOURCE
             try_compile(FILE64_OK "${PROJECT_BINARY_DIR}"
-                        "${PROJECT_SOURCE_DIR}/CMake/TestFileOffsetBits.c"
+                        "${PROJECT_SOURCE_DIR}/cmake/TestFileOffsetBits.c"
                         COMPILE_DEFINITIONS "-D_LARGEFILE_SOURCE" )
             if(FILE64_OK)
                 message(STATUS "Checking for 64-bit off_t - present with _LARGEFILE_SOURCE")
@@ -69,7 +69,7 @@ macro(OPJ_TEST_LARGE_FILES VARIABLE)
         #if(NOT FILE64_OK)
         #    # now check for Windows stuff
         #    try_compile(FILE64_OK "${PROJECT_BINARY_DIR}"
-        #                "${PROJECT_SOURCE_DIR}/CMake/TestWindowsFSeek.c")
+        #                "${PROJECT_SOURCE_DIR}/cmake/TestWindowsFSeek.c")
         #    if(FILE64_OK)
         #        message(STATUS "Checking for 64-bit off_t - present with _fseeki64")
         #        set(HAVE__FSEEKI64 1)
@@ -85,7 +85,7 @@ macro(OPJ_TEST_LARGE_FILES VARIABLE)
         set(_LARGEFILE_SOURCE ${_LARGEFILE_SOURCE} CACHE INTERNAL "Result of test for needed _LARGEFILE_SOURCE")
 
         # Set the flags we might have determined to be required above
-        configure_file("${PROJECT_SOURCE_DIR}/CMake/TestLargeFiles.c.cmake.in"
+        configure_file("${PROJECT_SOURCE_DIR}/cmake/TestLargeFiles.c.cmake.in"
                        "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/TestLargeFiles.c")
 
         message(STATUS "Checking for fseeko/ftello")
diff --git a/CMake/TestWindowsFSeek.c b/cmake/TestWindowsFSeek.c
similarity index 100%
rename from CMake/TestWindowsFSeek.c
rename to cmake/TestWindowsFSeek.c
diff --git a/CMake/openjpeg_valgrind.supp b/cmake/openjpeg_valgrind.supp
similarity index 100%
rename from CMake/openjpeg_valgrind.supp
rename to cmake/openjpeg_valgrind.supp
diff --git a/libopenjpeg/jpwl/CMakeLists.txt b/libopenjpeg/jpwl/CMakeLists.txt
deleted file mode 100644
index fe5ebbac..00000000
--- a/libopenjpeg/jpwl/CMakeLists.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-# Makefile for the main JPWL OpenJPEG codecs: JPWL_ j2k_to_image and JPWL_image_to_j2k
-
-add_definitions(-DUSE_JPWL)
-
-set(JPWL_SRCS crc.c jpwl.c jpwl_lib.c rs.c)
-if(APPLE)
-  set_source_files_properties(
-    rs.c
-    PROPERTIES
-    COMPILE_FLAGS -fno-common)
-endif()
-
-include_directories(
-  ${OPENJPEG_SOURCE_DIR}/libopenjpeg
-  )
-
-# Build the library
-if(WIN32)
-  if(BUILD_SHARED_LIBS)
-    add_definitions(-DOPJ_EXPORTS)
-  else()
-    add_definitions(-DOPJ_STATIC)
-  endif()
-endif()
-add_library(${OPENJPEG_LIBRARY_NAME}_JPWL ${JPWL_SRCS} ${OPENJPEG_SRCS})
-set_target_properties(${OPENJPEG_LIBRARY_NAME}_JPWL
-  PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES})
-
-# Install library
-install(TARGETS ${OPENJPEG_LIBRARY_NAME}_JPWL
-  EXPORT OpenJPEGTargets
-  RUNTIME DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
-  LIBRARY DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
-  ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100644
index 00000000..673843ec
--- /dev/null
+++ b/src/CMakeLists.txt
@@ -0,0 +1,12 @@
+# required dep for server:
+if(BUILD_JPIP_SERVER)
+  find_package(CURL REQUIRED)
+  find_package(FCGI REQUIRED)
+  find_package(Threads REQUIRED)
+  if(NOT CMAKE_USE_PTHREADS_INIT)
+    message(FATAL_ERROR "Only pthread are supported")
+  endif()
+endif()
+
+add_subdirectory(lib)
+#add_subdirectory(bin)
diff --git a/src/bin/CMakeLists.txt b/src/bin/CMakeLists.txt
new file mode 100644
index 00000000..fa94d070
--- /dev/null
+++ b/src/bin/CMakeLists.txt
@@ -0,0 +1,20 @@
+# source code for openjpeg apps:
+add_subdirectory(common)
+# Part 1 & 2:
+add_subdirectory(jp2)
+
+# optionals components:
+if(BUILD_JPWL)
+#  add_subdirectory(jpwl)
+endif()
+if(BUILD_MJ2)
+  add_subdirectory(mj2)
+endif()
+if(BUILD_JPIP)
+  add_subdirectory(jpip)
+endif()
+if(BUILD_JP3D)
+  add_subdirectory(jp3d)
+endif()
+
+add_subdirectory(wx)
diff --git a/src/bin/common/CMakeLists.txt b/src/bin/common/CMakeLists.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/applications/common/color.c b/src/bin/common/color.c
similarity index 100%
rename from applications/common/color.c
rename to src/bin/common/color.c
diff --git a/applications/common/color.h b/src/bin/common/color.h
similarity index 100%
rename from applications/common/color.h
rename to src/bin/common/color.h
diff --git a/applications/common/format_defs.h b/src/bin/common/format_defs.h
similarity index 100%
rename from applications/common/format_defs.h
rename to src/bin/common/format_defs.h
diff --git a/applications/common/opj_getopt.c b/src/bin/common/opj_getopt.c
similarity index 100%
rename from applications/common/opj_getopt.c
rename to src/bin/common/opj_getopt.c
diff --git a/applications/common/opj_getopt.h b/src/bin/common/opj_getopt.h
similarity index 100%
rename from applications/common/opj_getopt.h
rename to src/bin/common/opj_getopt.h
diff --git a/applications/codec/CMakeLists.txt b/src/bin/jp2/CMakeLists.txt
similarity index 93%
rename from applications/codec/CMakeLists.txt
rename to src/bin/jp2/CMakeLists.txt
index c290860f..5e77765e 100644
--- a/applications/codec/CMakeLists.txt
+++ b/src/bin/jp2/CMakeLists.txt
@@ -4,15 +4,15 @@
 set(common_SRCS
   convert.c
   index.c
-  ${OPENJPEG_SOURCE_DIR}/applications/common/color.c
-  ${OPENJPEG_SOURCE_DIR}/applications/common/opj_getopt.c
+  ${OPENJPEG_SOURCE_DIR}/src/bin/common/color.c
+  ${OPENJPEG_SOURCE_DIR}/src/bin/common/opj_getopt.c
   )
 
 # Headers file are located here:
 include_directories(
-  ${OPENJPEG_SOURCE_DIR}/libopenjpeg
+  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2
   ${LCMS_INCLUDE_DIRNAME}
-  ${OPENJPEG_SOURCE_DIR}/applications/common
+  ${OPENJPEG_SOURCE_DIR}/src/bin/common
   ${Z_INCLUDE_DIRNAME}
   ${PNG_INCLUDE_DIRNAME}
   ${TIFF_INCLUDE_DIRNAME}
diff --git a/applications/codec/Makefile.am b/src/bin/jp2/Makefile.am
similarity index 100%
rename from applications/codec/Makefile.am
rename to src/bin/jp2/Makefile.am
diff --git a/applications/codec/README b/src/bin/jp2/README
similarity index 100%
rename from applications/codec/README
rename to src/bin/jp2/README
diff --git a/applications/codec/convert.c b/src/bin/jp2/convert.c
similarity index 100%
rename from applications/codec/convert.c
rename to src/bin/jp2/convert.c
diff --git a/applications/codec/convert.h b/src/bin/jp2/convert.h
similarity index 100%
rename from applications/codec/convert.h
rename to src/bin/jp2/convert.h
diff --git a/applications/codec/image_to_j2k.c b/src/bin/jp2/image_to_j2k.c
similarity index 100%
rename from applications/codec/image_to_j2k.c
rename to src/bin/jp2/image_to_j2k.c
diff --git a/applications/codec/index.c b/src/bin/jp2/index.c
similarity index 100%
rename from applications/codec/index.c
rename to src/bin/jp2/index.c
diff --git a/applications/codec/index.h b/src/bin/jp2/index.h
similarity index 100%
rename from applications/codec/index.h
rename to src/bin/jp2/index.h
diff --git a/applications/codec/j2k_dump.c b/src/bin/jp2/j2k_dump.c
similarity index 100%
rename from applications/codec/j2k_dump.c
rename to src/bin/jp2/j2k_dump.c
diff --git a/applications/codec/j2k_to_image.c b/src/bin/jp2/j2k_to_image.c
similarity index 100%
rename from applications/codec/j2k_to_image.c
rename to src/bin/jp2/j2k_to_image.c
diff --git a/applications/codec/windirent.h b/src/bin/jp2/windirent.h
similarity index 100%
rename from applications/codec/windirent.h
rename to src/bin/jp2/windirent.h
diff --git a/applications/jpip/util/CMakeLists.txt b/src/bin/jpip/CMakeLists.txt
similarity index 97%
rename from applications/jpip/util/CMakeLists.txt
rename to src/bin/jpip/CMakeLists.txt
index b1306bb4..5a3fc0ff 100644
--- a/applications/jpip/util/CMakeLists.txt
+++ b/src/bin/jpip/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Headers file are located here:
 include_directories(
-  ${OPENJPEG_SOURCE_DIR}/libopenjpeg # opj_stdint.h
-  ${OPENJPEG_SOURCE_DIR}/applications/jpip/libopenjpip
+  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2 # opj_stdint.h
+  ${OPENJPEG_SOURCE_DIR}/src/lib/openjpip
   ${FCGI_INCLUDE_DIRS}
 )
 
diff --git a/applications/jpip/util/Makefile.am b/src/bin/jpip/Makefile.am
similarity index 100%
rename from applications/jpip/util/Makefile.am
rename to src/bin/jpip/Makefile.am
diff --git a/applications/jpip/util/addXMLinJP2.c b/src/bin/jpip/addXMLinJP2.c
similarity index 100%
rename from applications/jpip/util/addXMLinJP2.c
rename to src/bin/jpip/addXMLinJP2.c
diff --git a/applications/jpip/util/jpip_to_j2k.c b/src/bin/jpip/jpip_to_j2k.c
similarity index 100%
rename from applications/jpip/util/jpip_to_j2k.c
rename to src/bin/jpip/jpip_to_j2k.c
diff --git a/applications/jpip/util/jpip_to_jp2.c b/src/bin/jpip/jpip_to_jp2.c
similarity index 100%
rename from applications/jpip/util/jpip_to_jp2.c
rename to src/bin/jpip/jpip_to_jp2.c
diff --git a/applications/jpip/util/opj_dec_server.c b/src/bin/jpip/opj_dec_server.c
similarity index 100%
rename from applications/jpip/util/opj_dec_server.c
rename to src/bin/jpip/opj_dec_server.c
diff --git a/applications/jpip/util/opj_server.c b/src/bin/jpip/opj_server.c
similarity index 100%
rename from applications/jpip/util/opj_server.c
rename to src/bin/jpip/opj_server.c
diff --git a/applications/jpip/util/opj_viewer/dist/manifest.txt b/src/bin/jpip/opj_viewer/dist/manifest.txt
similarity index 100%
rename from applications/jpip/util/opj_viewer/dist/manifest.txt
rename to src/bin/jpip/opj_viewer/dist/manifest.txt
diff --git a/applications/jpip/util/opj_viewer/src/ImageManager.java b/src/bin/jpip/opj_viewer/src/ImageManager.java
similarity index 100%
rename from applications/jpip/util/opj_viewer/src/ImageManager.java
rename to src/bin/jpip/opj_viewer/src/ImageManager.java
diff --git a/applications/jpip/util/opj_viewer/src/ImageViewer.java b/src/bin/jpip/opj_viewer/src/ImageViewer.java
similarity index 100%
rename from applications/jpip/util/opj_viewer/src/ImageViewer.java
rename to src/bin/jpip/opj_viewer/src/ImageViewer.java
diff --git a/applications/jpip/util/opj_viewer/src/ImageWindow.java b/src/bin/jpip/opj_viewer/src/ImageWindow.java
similarity index 100%
rename from applications/jpip/util/opj_viewer/src/ImageWindow.java
rename to src/bin/jpip/opj_viewer/src/ImageWindow.java
diff --git a/applications/jpip/util/opj_viewer/src/ImgdecClient.java b/src/bin/jpip/opj_viewer/src/ImgdecClient.java
similarity index 100%
rename from applications/jpip/util/opj_viewer/src/ImgdecClient.java
rename to src/bin/jpip/opj_viewer/src/ImgdecClient.java
diff --git a/applications/jpip/util/opj_viewer/src/JPIPHttpClient.java b/src/bin/jpip/opj_viewer/src/JPIPHttpClient.java
similarity index 100%
rename from applications/jpip/util/opj_viewer/src/JPIPHttpClient.java
rename to src/bin/jpip/opj_viewer/src/JPIPHttpClient.java
diff --git a/applications/jpip/util/opj_viewer/src/MML.java b/src/bin/jpip/opj_viewer/src/MML.java
similarity index 100%
rename from applications/jpip/util/opj_viewer/src/MML.java
rename to src/bin/jpip/opj_viewer/src/MML.java
diff --git a/applications/jpip/util/opj_viewer/src/PnmImage.java b/src/bin/jpip/opj_viewer/src/PnmImage.java
similarity index 100%
rename from applications/jpip/util/opj_viewer/src/PnmImage.java
rename to src/bin/jpip/opj_viewer/src/PnmImage.java
diff --git a/applications/jpip/util/opj_viewer/src/RegimViewer.java b/src/bin/jpip/opj_viewer/src/RegimViewer.java
similarity index 100%
rename from applications/jpip/util/opj_viewer/src/RegimViewer.java
rename to src/bin/jpip/opj_viewer/src/RegimViewer.java
diff --git a/applications/jpip/util/opj_viewer/src/ResizeListener.java b/src/bin/jpip/opj_viewer/src/ResizeListener.java
similarity index 100%
rename from applications/jpip/util/opj_viewer/src/ResizeListener.java
rename to src/bin/jpip/opj_viewer/src/ResizeListener.java
diff --git a/applications/jpip/util/opj_viewer_xerces/dist/manifest.txt.in b/src/bin/jpip/opj_viewer_xerces/dist/manifest.txt.in
similarity index 100%
rename from applications/jpip/util/opj_viewer_xerces/dist/manifest.txt.in
rename to src/bin/jpip/opj_viewer_xerces/dist/manifest.txt.in
diff --git a/applications/jpip/util/opj_viewer_xerces/src/ImageViewer.java b/src/bin/jpip/opj_viewer_xerces/src/ImageViewer.java
similarity index 100%
rename from applications/jpip/util/opj_viewer_xerces/src/ImageViewer.java
rename to src/bin/jpip/opj_viewer_xerces/src/ImageViewer.java
diff --git a/applications/jpip/util/opj_viewer_xerces/src/ImageWindow.java b/src/bin/jpip/opj_viewer_xerces/src/ImageWindow.java
similarity index 100%
rename from applications/jpip/util/opj_viewer_xerces/src/ImageWindow.java
rename to src/bin/jpip/opj_viewer_xerces/src/ImageWindow.java
diff --git a/applications/jpip/util/opj_viewer_xerces/src/JP2XMLparser.java b/src/bin/jpip/opj_viewer_xerces/src/JP2XMLparser.java
similarity index 100%
rename from applications/jpip/util/opj_viewer_xerces/src/JP2XMLparser.java
rename to src/bin/jpip/opj_viewer_xerces/src/JP2XMLparser.java
diff --git a/applications/jpip/util/opj_viewer_xerces/src/OptionPanel.java b/src/bin/jpip/opj_viewer_xerces/src/OptionPanel.java
similarity index 100%
rename from applications/jpip/util/opj_viewer_xerces/src/OptionPanel.java
rename to src/bin/jpip/opj_viewer_xerces/src/OptionPanel.java
diff --git a/applications/jpip/util/test_index.c b/src/bin/jpip/test_index.c
similarity index 100%
rename from applications/jpip/util/test_index.c
rename to src/bin/jpip/test_index.c
diff --git a/applications/mj2/CMakeLists.txt b/src/bin/mj2/CMakeLists.txt
similarity index 51%
rename from applications/mj2/CMakeLists.txt
rename to src/bin/mj2/CMakeLists.txt
index e286000b..44514c54 100644
--- a/applications/mj2/CMakeLists.txt
+++ b/src/bin/mj2/CMakeLists.txt
@@ -1,33 +1,33 @@
 # Makefile for the MJ2 codecs of the OpenJPEG library: frames_to_mj2, mj2_to_frames, extract_j2k_from_mj2 and wrap_j2k_in_mj2
 
-set(common_SRCS ${OPENJPEG_SOURCE_DIR}/applications/common/opj_getopt.c)
+set(common_SRCS ${OPENJPEG_SOURCE_DIR}/src/bin/common/opj_getopt.c)
 
 # While mj2 executables do not use the API correctly, we do not link with the library but rather compile the sources files.
 set(OPJ_SRCS
-${OPENJPEG_SOURCE_DIR}/libopenjpeg/bio.c
-${OPENJPEG_SOURCE_DIR}/libopenjpeg/cio.c
-${OPENJPEG_SOURCE_DIR}/libopenjpeg/dwt.c
-${OPENJPEG_SOURCE_DIR}/libopenjpeg/event.c
-${OPENJPEG_SOURCE_DIR}/libopenjpeg/image.c
-${OPENJPEG_SOURCE_DIR}/libopenjpeg/j2k.c
-${OPENJPEG_SOURCE_DIR}/libopenjpeg/j2k_lib.c
-${OPENJPEG_SOURCE_DIR}/libopenjpeg/jp2.c
-${OPENJPEG_SOURCE_DIR}/libopenjpeg/jpt.c
-${OPENJPEG_SOURCE_DIR}/libopenjpeg/mct.c
-${OPENJPEG_SOURCE_DIR}/libopenjpeg/mqc.c
-${OPENJPEG_SOURCE_DIR}/libopenjpeg/openjpeg.c
-${OPENJPEG_SOURCE_DIR}/libopenjpeg/pi.c
-${OPENJPEG_SOURCE_DIR}/libopenjpeg/raw.c
-${OPENJPEG_SOURCE_DIR}/libopenjpeg/t1.c
-${OPENJPEG_SOURCE_DIR}/libopenjpeg/t2.c
-${OPENJPEG_SOURCE_DIR}/libopenjpeg/tcd.c
-${OPENJPEG_SOURCE_DIR}/libopenjpeg/tgt.c
-${OPENJPEG_SOURCE_DIR}/libopenjpeg/cidx_manager.c
-${OPENJPEG_SOURCE_DIR}/libopenjpeg/phix_manager.c
-${OPENJPEG_SOURCE_DIR}/libopenjpeg/ppix_manager.c
-${OPENJPEG_SOURCE_DIR}/libopenjpeg/thix_manager.c
-${OPENJPEG_SOURCE_DIR}/libopenjpeg/tpix_manager.c
-${OPENJPEG_SOURCE_DIR}/libopenjpeg/function_list.c
+${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/bio.c
+${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/cio.c
+${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/dwt.c
+${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/event.c
+${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/image.c
+${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/j2k.c
+${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/j2k_lib.c
+${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/jp2.c
+${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/jpt.c
+${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/mct.c
+${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/mqc.c
+${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/openjpeg.c
+${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/pi.c
+${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/raw.c
+${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/t1.c
+${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/t2.c
+${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/tcd.c
+${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/tgt.c
+${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/cidx_manager.c
+${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/phix_manager.c
+${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/ppix_manager.c
+${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/thix_manager.c
+${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/tpix_manager.c
+${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/function_list.c
 )
 
 set(MJ2_SRCS mj2.c mj2_convert.c)
@@ -38,8 +38,8 @@ endif()
 
 # Headers file are located here:
 include_directories(
-  ${OPENJPEG_SOURCE_DIR}/libopenjpeg
-  ${OPENJPEG_SOURCE_DIR}/applications/common
+  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2
+  ${OPENJPEG_SOURCE_DIR}/src/bin/common
   ${LCMS_INCLUDE_DIRNAME}
   )
 
@@ -60,7 +60,7 @@ add_executable(mj2_to_frames
     ${common_SRCS}
     ${OPJ_SRCS}
     ${MJ2_SRCS}
-    ${OPENJPEG_SOURCE_DIR}/applications/common/color.c
+    ${OPENJPEG_SOURCE_DIR}/src/bin/common/color.c
     )
 target_link_libraries(mj2_to_frames ${LCMS_LIBNAME})
 
diff --git a/applications/mj2/Makefile.am b/src/bin/mj2/Makefile.am
similarity index 100%
rename from applications/mj2/Makefile.am
rename to src/bin/mj2/Makefile.am
diff --git a/applications/mj2/extract_j2k_from_mj2.c b/src/bin/mj2/extract_j2k_from_mj2.c
similarity index 100%
rename from applications/mj2/extract_j2k_from_mj2.c
rename to src/bin/mj2/extract_j2k_from_mj2.c
diff --git a/applications/mj2/frames_to_mj2.c b/src/bin/mj2/frames_to_mj2.c
similarity index 100%
rename from applications/mj2/frames_to_mj2.c
rename to src/bin/mj2/frames_to_mj2.c
diff --git a/applications/mj2/meta_out.c b/src/bin/mj2/meta_out.c
similarity index 100%
rename from applications/mj2/meta_out.c
rename to src/bin/mj2/meta_out.c
diff --git a/applications/mj2/meta_out.h b/src/bin/mj2/meta_out.h
similarity index 100%
rename from applications/mj2/meta_out.h
rename to src/bin/mj2/meta_out.h
diff --git a/applications/mj2/mj2.c b/src/bin/mj2/mj2.c
similarity index 100%
rename from applications/mj2/mj2.c
rename to src/bin/mj2/mj2.c
diff --git a/applications/mj2/mj2.h b/src/bin/mj2/mj2.h
similarity index 100%
rename from applications/mj2/mj2.h
rename to src/bin/mj2/mj2.h
diff --git a/applications/mj2/mj2_convert.c b/src/bin/mj2/mj2_convert.c
similarity index 100%
rename from applications/mj2/mj2_convert.c
rename to src/bin/mj2/mj2_convert.c
diff --git a/applications/mj2/mj2_convert.h b/src/bin/mj2/mj2_convert.h
similarity index 100%
rename from applications/mj2/mj2_convert.h
rename to src/bin/mj2/mj2_convert.h
diff --git a/applications/mj2/mj2_to_frames.c b/src/bin/mj2/mj2_to_frames.c
similarity index 100%
rename from applications/mj2/mj2_to_frames.c
rename to src/bin/mj2/mj2_to_frames.c
diff --git a/applications/mj2/mj2_to_metadata.c b/src/bin/mj2/mj2_to_metadata.c
similarity index 100%
rename from applications/mj2/mj2_to_metadata.c
rename to src/bin/mj2/mj2_to_metadata.c
diff --git a/applications/mj2/mj2_to_metadata.dtd b/src/bin/mj2/mj2_to_metadata.dtd
similarity index 100%
rename from applications/mj2/mj2_to_metadata.dtd
rename to src/bin/mj2/mj2_to_metadata.dtd
diff --git a/applications/mj2/mj2_to_metadata.h b/src/bin/mj2/mj2_to_metadata.h
similarity index 100%
rename from applications/mj2/mj2_to_metadata.h
rename to src/bin/mj2/mj2_to_metadata.h
diff --git a/applications/mj2/mj2_to_metadata.sln b/src/bin/mj2/mj2_to_metadata.sln
similarity index 100%
rename from applications/mj2/mj2_to_metadata.sln
rename to src/bin/mj2/mj2_to_metadata.sln
diff --git a/applications/mj2/mj2_to_metadata.vcproj b/src/bin/mj2/mj2_to_metadata.vcproj
similarity index 100%
rename from applications/mj2/mj2_to_metadata.vcproj
rename to src/bin/mj2/mj2_to_metadata.vcproj
diff --git a/applications/mj2/mj2_to_metadata_Notes.doc b/src/bin/mj2/mj2_to_metadata_Notes.doc
similarity index 100%
rename from applications/mj2/mj2_to_metadata_Notes.doc
rename to src/bin/mj2/mj2_to_metadata_Notes.doc
diff --git a/applications/mj2/readme.txt b/src/bin/mj2/readme.txt
similarity index 100%
rename from applications/mj2/readme.txt
rename to src/bin/mj2/readme.txt
diff --git a/applications/mj2/wrap_j2k_in_mj2.c b/src/bin/mj2/wrap_j2k_in_mj2.c
similarity index 100%
rename from applications/mj2/wrap_j2k_in_mj2.c
rename to src/bin/mj2/wrap_j2k_in_mj2.c
diff --git a/src/bin/wx/CMakeLists.txt b/src/bin/wx/CMakeLists.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/applications/OPJViewer/CMakeLists.txt b/src/bin/wx/OPJViewer/CMakeLists.txt
similarity index 100%
rename from applications/OPJViewer/CMakeLists.txt
rename to src/bin/wx/OPJViewer/CMakeLists.txt
diff --git a/applications/OPJViewer/OPJViewer.iss b/src/bin/wx/OPJViewer/OPJViewer.iss
similarity index 100%
rename from applications/OPJViewer/OPJViewer.iss
rename to src/bin/wx/OPJViewer/OPJViewer.iss
diff --git a/applications/OPJViewer/Readme.txt b/src/bin/wx/OPJViewer/Readme.txt
similarity index 100%
rename from applications/OPJViewer/Readme.txt
rename to src/bin/wx/OPJViewer/Readme.txt
diff --git a/applications/OPJViewer/about/about.htm b/src/bin/wx/OPJViewer/about/about.htm
similarity index 100%
rename from applications/OPJViewer/about/about.htm
rename to src/bin/wx/OPJViewer/about/about.htm
diff --git a/applications/OPJViewer/about/opj_logo.png b/src/bin/wx/OPJViewer/about/opj_logo.png
similarity index 100%
rename from applications/OPJViewer/about/opj_logo.png
rename to src/bin/wx/OPJViewer/about/opj_logo.png
diff --git a/applications/OPJViewer/source/OPJAbout.cpp b/src/bin/wx/OPJViewer/source/OPJAbout.cpp
similarity index 100%
rename from applications/OPJViewer/source/OPJAbout.cpp
rename to src/bin/wx/OPJViewer/source/OPJAbout.cpp
diff --git a/applications/OPJViewer/source/OPJChild.ico b/src/bin/wx/OPJViewer/source/OPJChild.ico
similarity index 100%
rename from applications/OPJViewer/source/OPJChild.ico
rename to src/bin/wx/OPJViewer/source/OPJChild.ico
diff --git a/applications/OPJViewer/source/OPJChild16.xpm b/src/bin/wx/OPJViewer/source/OPJChild16.xpm
similarity index 100%
rename from applications/OPJViewer/source/OPJChild16.xpm
rename to src/bin/wx/OPJViewer/source/OPJChild16.xpm
diff --git a/applications/OPJViewer/source/OPJDialogs.cpp b/src/bin/wx/OPJViewer/source/OPJDialogs.cpp
similarity index 100%
rename from applications/OPJViewer/source/OPJDialogs.cpp
rename to src/bin/wx/OPJViewer/source/OPJDialogs.cpp
diff --git a/applications/OPJViewer/source/OPJThreads.cpp b/src/bin/wx/OPJViewer/source/OPJThreads.cpp
similarity index 100%
rename from applications/OPJViewer/source/OPJThreads.cpp
rename to src/bin/wx/OPJViewer/source/OPJThreads.cpp
diff --git a/applications/OPJViewer/source/OPJViewer.cpp b/src/bin/wx/OPJViewer/source/OPJViewer.cpp
similarity index 100%
rename from applications/OPJViewer/source/OPJViewer.cpp
rename to src/bin/wx/OPJViewer/source/OPJViewer.cpp
diff --git a/applications/OPJViewer/source/OPJViewer.h b/src/bin/wx/OPJViewer/source/OPJViewer.h
similarity index 100%
rename from applications/OPJViewer/source/OPJViewer.h
rename to src/bin/wx/OPJViewer/source/OPJViewer.h
diff --git a/applications/OPJViewer/source/OPJViewer.ico b/src/bin/wx/OPJViewer/source/OPJViewer.ico
similarity index 100%
rename from applications/OPJViewer/source/OPJViewer.ico
rename to src/bin/wx/OPJViewer/source/OPJViewer.ico
diff --git a/applications/OPJViewer/source/OPJViewer.rc b/src/bin/wx/OPJViewer/source/OPJViewer.rc
similarity index 100%
rename from applications/OPJViewer/source/OPJViewer.rc
rename to src/bin/wx/OPJViewer/source/OPJViewer.rc
diff --git a/applications/OPJViewer/source/OPJViewer16.xpm b/src/bin/wx/OPJViewer/source/OPJViewer16.xpm
similarity index 100%
rename from applications/OPJViewer/source/OPJViewer16.xpm
rename to src/bin/wx/OPJViewer/source/OPJViewer16.xpm
diff --git a/applications/OPJViewer/source/about_htm.h b/src/bin/wx/OPJViewer/source/about_htm.h
similarity index 100%
rename from applications/OPJViewer/source/about_htm.h
rename to src/bin/wx/OPJViewer/source/about_htm.h
diff --git a/applications/OPJViewer/source/build.h b/src/bin/wx/OPJViewer/source/build.h
similarity index 100%
rename from applications/OPJViewer/source/build.h
rename to src/bin/wx/OPJViewer/source/build.h
diff --git a/applications/OPJViewer/source/icon1.xpm b/src/bin/wx/OPJViewer/source/icon1.xpm
similarity index 100%
rename from applications/OPJViewer/source/icon1.xpm
rename to src/bin/wx/OPJViewer/source/icon1.xpm
diff --git a/applications/OPJViewer/source/icon2.xpm b/src/bin/wx/OPJViewer/source/icon2.xpm
similarity index 100%
rename from applications/OPJViewer/source/icon2.xpm
rename to src/bin/wx/OPJViewer/source/icon2.xpm
diff --git a/applications/OPJViewer/source/icon3.xpm b/src/bin/wx/OPJViewer/source/icon3.xpm
similarity index 100%
rename from applications/OPJViewer/source/icon3.xpm
rename to src/bin/wx/OPJViewer/source/icon3.xpm
diff --git a/applications/OPJViewer/source/icon4.xpm b/src/bin/wx/OPJViewer/source/icon4.xpm
similarity index 100%
rename from applications/OPJViewer/source/icon4.xpm
rename to src/bin/wx/OPJViewer/source/icon4.xpm
diff --git a/applications/OPJViewer/source/icon5.xpm b/src/bin/wx/OPJViewer/source/icon5.xpm
similarity index 100%
rename from applications/OPJViewer/source/icon5.xpm
rename to src/bin/wx/OPJViewer/source/icon5.xpm
diff --git a/applications/OPJViewer/source/imagjpeg2000.cpp b/src/bin/wx/OPJViewer/source/imagjpeg2000.cpp
similarity index 100%
rename from applications/OPJViewer/source/imagjpeg2000.cpp
rename to src/bin/wx/OPJViewer/source/imagjpeg2000.cpp
diff --git a/applications/OPJViewer/source/imagjpeg2000.h b/src/bin/wx/OPJViewer/source/imagjpeg2000.h
similarity index 100%
rename from applications/OPJViewer/source/imagjpeg2000.h
rename to src/bin/wx/OPJViewer/source/imagjpeg2000.h
diff --git a/applications/OPJViewer/source/imagmxf.cpp b/src/bin/wx/OPJViewer/source/imagmxf.cpp
similarity index 100%
rename from applications/OPJViewer/source/imagmxf.cpp
rename to src/bin/wx/OPJViewer/source/imagmxf.cpp
diff --git a/applications/OPJViewer/source/imagmxf.h b/src/bin/wx/OPJViewer/source/imagmxf.h
similarity index 100%
rename from applications/OPJViewer/source/imagmxf.h
rename to src/bin/wx/OPJViewer/source/imagmxf.h
diff --git a/applications/OPJViewer/source/license.txt b/src/bin/wx/OPJViewer/source/license.txt
similarity index 100%
rename from applications/OPJViewer/source/license.txt
rename to src/bin/wx/OPJViewer/source/license.txt
diff --git a/applications/OPJViewer/source/opj_logo.xpm b/src/bin/wx/OPJViewer/source/opj_logo.xpm
similarity index 100%
rename from applications/OPJViewer/source/opj_logo.xpm
rename to src/bin/wx/OPJViewer/source/opj_logo.xpm
diff --git a/applications/OPJViewer/source/readmeafter.txt b/src/bin/wx/OPJViewer/source/readmeafter.txt
similarity index 100%
rename from applications/OPJViewer/source/readmeafter.txt
rename to src/bin/wx/OPJViewer/source/readmeafter.txt
diff --git a/applications/OPJViewer/source/readmebefore.txt b/src/bin/wx/OPJViewer/source/readmebefore.txt
similarity index 100%
rename from applications/OPJViewer/source/readmebefore.txt
rename to src/bin/wx/OPJViewer/source/readmebefore.txt
diff --git a/applications/OPJViewer/source/wxj2kparser.cpp b/src/bin/wx/OPJViewer/source/wxj2kparser.cpp
similarity index 100%
rename from applications/OPJViewer/source/wxj2kparser.cpp
rename to src/bin/wx/OPJViewer/source/wxj2kparser.cpp
diff --git a/applications/OPJViewer/source/wxjp2parser.cpp b/src/bin/wx/OPJViewer/source/wxjp2parser.cpp
similarity index 100%
rename from applications/OPJViewer/source/wxjp2parser.cpp
rename to src/bin/wx/OPJViewer/source/wxjp2parser.cpp
diff --git a/libopenjpeg/CMakeLists.txt b/src/lib/openjp2/CMakeLists.txt
similarity index 97%
rename from libopenjpeg/CMakeLists.txt
rename to src/lib/openjp2/CMakeLists.txt
index 268fc945..f58fe59d 100644
--- a/libopenjpeg/CMakeLists.txt
+++ b/src/lib/openjp2/CMakeLists.txt
@@ -41,11 +41,6 @@ if(UNIX)
 endif()
 set_target_properties(${OPENJPEG_LIBRARY_NAME} PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES})
 
-# Build the JPWL library ?
-if(BUILD_JPWL)
- add_subdirectory(jpwl)
-endif()
-
 # Install library
 install(TARGETS ${OPENJPEG_LIBRARY_NAME}
   EXPORT OpenJPEGTargets
diff --git a/libopenjpeg/Makefile.am b/src/lib/openjp2/Makefile.am
similarity index 100%
rename from libopenjpeg/Makefile.am
rename to src/lib/openjp2/Makefile.am
diff --git a/libopenjpeg/bio.c b/src/lib/openjp2/bio.c
similarity index 100%
rename from libopenjpeg/bio.c
rename to src/lib/openjp2/bio.c
diff --git a/libopenjpeg/bio.h b/src/lib/openjp2/bio.h
similarity index 100%
rename from libopenjpeg/bio.h
rename to src/lib/openjp2/bio.h
diff --git a/libopenjpeg/cidx_manager.c b/src/lib/openjp2/cidx_manager.c
similarity index 100%
rename from libopenjpeg/cidx_manager.c
rename to src/lib/openjp2/cidx_manager.c
diff --git a/libopenjpeg/cidx_manager.h b/src/lib/openjp2/cidx_manager.h
similarity index 100%
rename from libopenjpeg/cidx_manager.h
rename to src/lib/openjp2/cidx_manager.h
diff --git a/libopenjpeg/cio.c b/src/lib/openjp2/cio.c
similarity index 100%
rename from libopenjpeg/cio.c
rename to src/lib/openjp2/cio.c
diff --git a/libopenjpeg/cio.h b/src/lib/openjp2/cio.h
similarity index 100%
rename from libopenjpeg/cio.h
rename to src/lib/openjp2/cio.h
diff --git a/libopenjpeg/dwt.c b/src/lib/openjp2/dwt.c
similarity index 100%
rename from libopenjpeg/dwt.c
rename to src/lib/openjp2/dwt.c
diff --git a/libopenjpeg/dwt.h b/src/lib/openjp2/dwt.h
similarity index 100%
rename from libopenjpeg/dwt.h
rename to src/lib/openjp2/dwt.h
diff --git a/libopenjpeg/event.c b/src/lib/openjp2/event.c
similarity index 100%
rename from libopenjpeg/event.c
rename to src/lib/openjp2/event.c
diff --git a/libopenjpeg/event.h b/src/lib/openjp2/event.h
similarity index 100%
rename from libopenjpeg/event.h
rename to src/lib/openjp2/event.h
diff --git a/libopenjpeg/fix.h b/src/lib/openjp2/fix.h
similarity index 100%
rename from libopenjpeg/fix.h
rename to src/lib/openjp2/fix.h
diff --git a/libopenjpeg/function_list.c b/src/lib/openjp2/function_list.c
similarity index 100%
rename from libopenjpeg/function_list.c
rename to src/lib/openjp2/function_list.c
diff --git a/libopenjpeg/function_list.h b/src/lib/openjp2/function_list.h
similarity index 100%
rename from libopenjpeg/function_list.h
rename to src/lib/openjp2/function_list.h
diff --git a/libopenjpeg/image.c b/src/lib/openjp2/image.c
similarity index 100%
rename from libopenjpeg/image.c
rename to src/lib/openjp2/image.c
diff --git a/libopenjpeg/image.h b/src/lib/openjp2/image.h
similarity index 100%
rename from libopenjpeg/image.h
rename to src/lib/openjp2/image.h
diff --git a/libopenjpeg/indexbox_manager.h b/src/lib/openjp2/indexbox_manager.h
similarity index 100%
rename from libopenjpeg/indexbox_manager.h
rename to src/lib/openjp2/indexbox_manager.h
diff --git a/libopenjpeg/int.h b/src/lib/openjp2/int.h
similarity index 100%
rename from libopenjpeg/int.h
rename to src/lib/openjp2/int.h
diff --git a/libopenjpeg/j2k.c b/src/lib/openjp2/j2k.c
similarity index 100%
rename from libopenjpeg/j2k.c
rename to src/lib/openjp2/j2k.c
diff --git a/libopenjpeg/j2k.h b/src/lib/openjp2/j2k.h
similarity index 100%
rename from libopenjpeg/j2k.h
rename to src/lib/openjp2/j2k.h
diff --git a/libopenjpeg/j2k_lib.c b/src/lib/openjp2/j2k_lib.c
similarity index 100%
rename from libopenjpeg/j2k_lib.c
rename to src/lib/openjp2/j2k_lib.c
diff --git a/libopenjpeg/j2k_lib.h b/src/lib/openjp2/j2k_lib.h
similarity index 100%
rename from libopenjpeg/j2k_lib.h
rename to src/lib/openjp2/j2k_lib.h
diff --git a/libopenjpeg/jp2.c b/src/lib/openjp2/jp2.c
similarity index 100%
rename from libopenjpeg/jp2.c
rename to src/lib/openjp2/jp2.c
diff --git a/libopenjpeg/jp2.h b/src/lib/openjp2/jp2.h
similarity index 100%
rename from libopenjpeg/jp2.h
rename to src/lib/openjp2/jp2.h
diff --git a/libopenjpeg/jpt.c b/src/lib/openjp2/jpt.c
similarity index 100%
rename from libopenjpeg/jpt.c
rename to src/lib/openjp2/jpt.c
diff --git a/libopenjpeg/jpt.h b/src/lib/openjp2/jpt.h
similarity index 100%
rename from libopenjpeg/jpt.h
rename to src/lib/openjp2/jpt.h
diff --git a/libopenjpeg/mct.c b/src/lib/openjp2/mct.c
similarity index 100%
rename from libopenjpeg/mct.c
rename to src/lib/openjp2/mct.c
diff --git a/libopenjpeg/mct.h b/src/lib/openjp2/mct.h
similarity index 100%
rename from libopenjpeg/mct.h
rename to src/lib/openjp2/mct.h
diff --git a/libopenjpeg/mqc.c b/src/lib/openjp2/mqc.c
similarity index 100%
rename from libopenjpeg/mqc.c
rename to src/lib/openjp2/mqc.c
diff --git a/libopenjpeg/mqc.h b/src/lib/openjp2/mqc.h
similarity index 100%
rename from libopenjpeg/mqc.h
rename to src/lib/openjp2/mqc.h
diff --git a/libopenjpeg/openjpeg.c b/src/lib/openjp2/openjpeg.c
similarity index 100%
rename from libopenjpeg/openjpeg.c
rename to src/lib/openjp2/openjpeg.c
diff --git a/libopenjpeg/openjpeg.h b/src/lib/openjp2/openjpeg.h
similarity index 100%
rename from libopenjpeg/openjpeg.h
rename to src/lib/openjp2/openjpeg.h
diff --git a/libopenjpeg/opj_includes.h b/src/lib/openjp2/opj_includes.h
similarity index 99%
rename from libopenjpeg/opj_includes.h
rename to src/lib/openjp2/opj_includes.h
index ebc946ac..98a5b86b 100644
--- a/libopenjpeg/opj_includes.h
+++ b/src/lib/openjp2/opj_includes.h
@@ -175,7 +175,7 @@ static INLINE long lrintf(float f){
 
 /* JPWL>> */
 #ifdef USE_JPWL
-#include "./jpwl/jpwl.h"
+#include "openjpwl/jpwl.h"
 #endif /* USE_JPWL */
 /* <<JPWL */
 
diff --git a/libopenjpeg/opj_inttypes.h b/src/lib/openjp2/opj_inttypes.h
similarity index 100%
rename from libopenjpeg/opj_inttypes.h
rename to src/lib/openjp2/opj_inttypes.h
diff --git a/libopenjpeg/opj_malloc.h b/src/lib/openjp2/opj_malloc.h
similarity index 100%
rename from libopenjpeg/opj_malloc.h
rename to src/lib/openjp2/opj_malloc.h
diff --git a/libopenjpeg/opj_stdint.h b/src/lib/openjp2/opj_stdint.h
similarity index 100%
rename from libopenjpeg/opj_stdint.h
rename to src/lib/openjp2/opj_stdint.h
diff --git a/libopenjpeg/phix_manager.c b/src/lib/openjp2/phix_manager.c
similarity index 100%
rename from libopenjpeg/phix_manager.c
rename to src/lib/openjp2/phix_manager.c
diff --git a/libopenjpeg/pi.c b/src/lib/openjp2/pi.c
similarity index 100%
rename from libopenjpeg/pi.c
rename to src/lib/openjp2/pi.c
diff --git a/libopenjpeg/pi.h b/src/lib/openjp2/pi.h
similarity index 100%
rename from libopenjpeg/pi.h
rename to src/lib/openjp2/pi.h
diff --git a/libopenjpeg/ppix_manager.c b/src/lib/openjp2/ppix_manager.c
similarity index 100%
rename from libopenjpeg/ppix_manager.c
rename to src/lib/openjp2/ppix_manager.c
diff --git a/libopenjpeg/raw.c b/src/lib/openjp2/raw.c
similarity index 100%
rename from libopenjpeg/raw.c
rename to src/lib/openjp2/raw.c
diff --git a/libopenjpeg/raw.h b/src/lib/openjp2/raw.h
similarity index 100%
rename from libopenjpeg/raw.h
rename to src/lib/openjp2/raw.h
diff --git a/libopenjpeg/t1.c b/src/lib/openjp2/t1.c
similarity index 100%
rename from libopenjpeg/t1.c
rename to src/lib/openjp2/t1.c
diff --git a/libopenjpeg/t1.h b/src/lib/openjp2/t1.h
similarity index 100%
rename from libopenjpeg/t1.h
rename to src/lib/openjp2/t1.h
diff --git a/libopenjpeg/t1_generate_luts.c b/src/lib/openjp2/t1_generate_luts.c
similarity index 100%
rename from libopenjpeg/t1_generate_luts.c
rename to src/lib/openjp2/t1_generate_luts.c
diff --git a/libopenjpeg/t1_luts.h b/src/lib/openjp2/t1_luts.h
similarity index 100%
rename from libopenjpeg/t1_luts.h
rename to src/lib/openjp2/t1_luts.h
diff --git a/libopenjpeg/t2.c b/src/lib/openjp2/t2.c
similarity index 100%
rename from libopenjpeg/t2.c
rename to src/lib/openjp2/t2.c
diff --git a/libopenjpeg/t2.h b/src/lib/openjp2/t2.h
similarity index 100%
rename from libopenjpeg/t2.h
rename to src/lib/openjp2/t2.h
diff --git a/libopenjpeg/tcd.c b/src/lib/openjp2/tcd.c
similarity index 100%
rename from libopenjpeg/tcd.c
rename to src/lib/openjp2/tcd.c
diff --git a/libopenjpeg/tcd.h b/src/lib/openjp2/tcd.h
similarity index 100%
rename from libopenjpeg/tcd.h
rename to src/lib/openjp2/tcd.h
diff --git a/libopenjpeg/tgt.c b/src/lib/openjp2/tgt.c
similarity index 100%
rename from libopenjpeg/tgt.c
rename to src/lib/openjp2/tgt.c
diff --git a/libopenjpeg/tgt.h b/src/lib/openjp2/tgt.h
similarity index 100%
rename from libopenjpeg/tgt.h
rename to src/lib/openjp2/tgt.h
diff --git a/libopenjpeg/thix_manager.c b/src/lib/openjp2/thix_manager.c
similarity index 100%
rename from libopenjpeg/thix_manager.c
rename to src/lib/openjp2/thix_manager.c
diff --git a/libopenjpeg/tpix_manager.c b/src/lib/openjp2/tpix_manager.c
similarity index 100%
rename from libopenjpeg/tpix_manager.c
rename to src/lib/openjp2/tpix_manager.c
diff --git a/applications/jpip/libopenjpip/CMakeLists.txt b/src/lib/openjpip/CMakeLists.txt
similarity index 98%
rename from applications/jpip/libopenjpip/CMakeLists.txt
rename to src/lib/openjpip/CMakeLists.txt
index 0afff2e1..e42e95fc 100644
--- a/applications/jpip/libopenjpip/CMakeLists.txt
+++ b/src/lib/openjpip/CMakeLists.txt
@@ -1,7 +1,7 @@
 include_regular_expression("^.*$")
 
 include_directories(
-  ${OPENJPEG_SOURCE_DIR}/libopenjpeg
+  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2
   ${FCGI_INCLUDE_DIRS}
   ${CURL_INCLUDE_DIRS}
 )
diff --git a/applications/jpip/libopenjpip/Makefile.am b/src/lib/openjpip/Makefile.am
similarity index 100%
rename from applications/jpip/libopenjpip/Makefile.am
rename to src/lib/openjpip/Makefile.am
diff --git a/applications/jpip/libopenjpip/auxtrans_manager.c b/src/lib/openjpip/auxtrans_manager.c
similarity index 100%
rename from applications/jpip/libopenjpip/auxtrans_manager.c
rename to src/lib/openjpip/auxtrans_manager.c
diff --git a/applications/jpip/libopenjpip/auxtrans_manager.h b/src/lib/openjpip/auxtrans_manager.h
similarity index 100%
rename from applications/jpip/libopenjpip/auxtrans_manager.h
rename to src/lib/openjpip/auxtrans_manager.h
diff --git a/applications/jpip/libopenjpip/bool.h b/src/lib/openjpip/bool.h
similarity index 100%
rename from applications/jpip/libopenjpip/bool.h
rename to src/lib/openjpip/bool.h
diff --git a/applications/jpip/libopenjpip/box_manager.c b/src/lib/openjpip/box_manager.c
similarity index 100%
rename from applications/jpip/libopenjpip/box_manager.c
rename to src/lib/openjpip/box_manager.c
diff --git a/applications/jpip/libopenjpip/box_manager.h b/src/lib/openjpip/box_manager.h
similarity index 100%
rename from applications/jpip/libopenjpip/box_manager.h
rename to src/lib/openjpip/box_manager.h
diff --git a/applications/jpip/libopenjpip/boxheader_manager.c b/src/lib/openjpip/boxheader_manager.c
similarity index 100%
rename from applications/jpip/libopenjpip/boxheader_manager.c
rename to src/lib/openjpip/boxheader_manager.c
diff --git a/applications/jpip/libopenjpip/boxheader_manager.h b/src/lib/openjpip/boxheader_manager.h
similarity index 100%
rename from applications/jpip/libopenjpip/boxheader_manager.h
rename to src/lib/openjpip/boxheader_manager.h
diff --git a/applications/jpip/libopenjpip/byte_manager.c b/src/lib/openjpip/byte_manager.c
similarity index 100%
rename from applications/jpip/libopenjpip/byte_manager.c
rename to src/lib/openjpip/byte_manager.c
diff --git a/applications/jpip/libopenjpip/byte_manager.h b/src/lib/openjpip/byte_manager.h
similarity index 100%
rename from applications/jpip/libopenjpip/byte_manager.h
rename to src/lib/openjpip/byte_manager.h
diff --git a/applications/jpip/libopenjpip/cache_manager.c b/src/lib/openjpip/cache_manager.c
similarity index 100%
rename from applications/jpip/libopenjpip/cache_manager.c
rename to src/lib/openjpip/cache_manager.c
diff --git a/applications/jpip/libopenjpip/cache_manager.h b/src/lib/openjpip/cache_manager.h
similarity index 100%
rename from applications/jpip/libopenjpip/cache_manager.h
rename to src/lib/openjpip/cache_manager.h
diff --git a/applications/jpip/libopenjpip/cachemodel_manager.c b/src/lib/openjpip/cachemodel_manager.c
similarity index 100%
rename from applications/jpip/libopenjpip/cachemodel_manager.c
rename to src/lib/openjpip/cachemodel_manager.c
diff --git a/applications/jpip/libopenjpip/cachemodel_manager.h b/src/lib/openjpip/cachemodel_manager.h
similarity index 100%
rename from applications/jpip/libopenjpip/cachemodel_manager.h
rename to src/lib/openjpip/cachemodel_manager.h
diff --git a/applications/jpip/libopenjpip/channel_manager.c b/src/lib/openjpip/channel_manager.c
similarity index 100%
rename from applications/jpip/libopenjpip/channel_manager.c
rename to src/lib/openjpip/channel_manager.c
diff --git a/applications/jpip/libopenjpip/channel_manager.h b/src/lib/openjpip/channel_manager.h
similarity index 100%
rename from applications/jpip/libopenjpip/channel_manager.h
rename to src/lib/openjpip/channel_manager.h
diff --git a/applications/jpip/libopenjpip/codestream_manager.c b/src/lib/openjpip/codestream_manager.c
similarity index 100%
rename from applications/jpip/libopenjpip/codestream_manager.c
rename to src/lib/openjpip/codestream_manager.c
diff --git a/applications/jpip/libopenjpip/codestream_manager.h b/src/lib/openjpip/codestream_manager.h
similarity index 100%
rename from applications/jpip/libopenjpip/codestream_manager.h
rename to src/lib/openjpip/codestream_manager.h
diff --git a/applications/jpip/libopenjpip/dec_clientmsg_handler.c b/src/lib/openjpip/dec_clientmsg_handler.c
similarity index 100%
rename from applications/jpip/libopenjpip/dec_clientmsg_handler.c
rename to src/lib/openjpip/dec_clientmsg_handler.c
diff --git a/applications/jpip/libopenjpip/dec_clientmsg_handler.h b/src/lib/openjpip/dec_clientmsg_handler.h
similarity index 100%
rename from applications/jpip/libopenjpip/dec_clientmsg_handler.h
rename to src/lib/openjpip/dec_clientmsg_handler.h
diff --git a/applications/jpip/libopenjpip/faixbox_manager.c b/src/lib/openjpip/faixbox_manager.c
similarity index 100%
rename from applications/jpip/libopenjpip/faixbox_manager.c
rename to src/lib/openjpip/faixbox_manager.c
diff --git a/applications/jpip/libopenjpip/faixbox_manager.h b/src/lib/openjpip/faixbox_manager.h
similarity index 100%
rename from applications/jpip/libopenjpip/faixbox_manager.h
rename to src/lib/openjpip/faixbox_manager.h
diff --git a/applications/jpip/libopenjpip/ihdrbox_manager.c b/src/lib/openjpip/ihdrbox_manager.c
similarity index 100%
rename from applications/jpip/libopenjpip/ihdrbox_manager.c
rename to src/lib/openjpip/ihdrbox_manager.c
diff --git a/applications/jpip/libopenjpip/ihdrbox_manager.h b/src/lib/openjpip/ihdrbox_manager.h
similarity index 100%
rename from applications/jpip/libopenjpip/ihdrbox_manager.h
rename to src/lib/openjpip/ihdrbox_manager.h
diff --git a/applications/jpip/libopenjpip/imgreg_manager.c b/src/lib/openjpip/imgreg_manager.c
similarity index 100%
rename from applications/jpip/libopenjpip/imgreg_manager.c
rename to src/lib/openjpip/imgreg_manager.c
diff --git a/applications/jpip/libopenjpip/imgreg_manager.h b/src/lib/openjpip/imgreg_manager.h
similarity index 100%
rename from applications/jpip/libopenjpip/imgreg_manager.h
rename to src/lib/openjpip/imgreg_manager.h
diff --git a/applications/jpip/libopenjpip/imgsock_manager.c b/src/lib/openjpip/imgsock_manager.c
similarity index 100%
rename from applications/jpip/libopenjpip/imgsock_manager.c
rename to src/lib/openjpip/imgsock_manager.c
diff --git a/applications/jpip/libopenjpip/imgsock_manager.h b/src/lib/openjpip/imgsock_manager.h
similarity index 100%
rename from applications/jpip/libopenjpip/imgsock_manager.h
rename to src/lib/openjpip/imgsock_manager.h
diff --git a/applications/jpip/libopenjpip/index_manager.c b/src/lib/openjpip/index_manager.c
similarity index 100%
rename from applications/jpip/libopenjpip/index_manager.c
rename to src/lib/openjpip/index_manager.c
diff --git a/applications/jpip/libopenjpip/index_manager.h b/src/lib/openjpip/index_manager.h
similarity index 100%
rename from applications/jpip/libopenjpip/index_manager.h
rename to src/lib/openjpip/index_manager.h
diff --git a/applications/jpip/libopenjpip/j2kheader_manager.c b/src/lib/openjpip/j2kheader_manager.c
similarity index 100%
rename from applications/jpip/libopenjpip/j2kheader_manager.c
rename to src/lib/openjpip/j2kheader_manager.c
diff --git a/applications/jpip/libopenjpip/j2kheader_manager.h b/src/lib/openjpip/j2kheader_manager.h
similarity index 100%
rename from applications/jpip/libopenjpip/j2kheader_manager.h
rename to src/lib/openjpip/j2kheader_manager.h
diff --git a/applications/jpip/libopenjpip/jp2k_decoder.c b/src/lib/openjpip/jp2k_decoder.c
similarity index 100%
rename from applications/jpip/libopenjpip/jp2k_decoder.c
rename to src/lib/openjpip/jp2k_decoder.c
diff --git a/applications/jpip/libopenjpip/jp2k_decoder.h b/src/lib/openjpip/jp2k_decoder.h
similarity index 100%
rename from applications/jpip/libopenjpip/jp2k_decoder.h
rename to src/lib/openjpip/jp2k_decoder.h
diff --git a/applications/jpip/libopenjpip/jp2k_encoder.c b/src/lib/openjpip/jp2k_encoder.c
similarity index 100%
rename from applications/jpip/libopenjpip/jp2k_encoder.c
rename to src/lib/openjpip/jp2k_encoder.c
diff --git a/applications/jpip/libopenjpip/jp2k_encoder.h b/src/lib/openjpip/jp2k_encoder.h
similarity index 100%
rename from applications/jpip/libopenjpip/jp2k_encoder.h
rename to src/lib/openjpip/jp2k_encoder.h
diff --git a/applications/jpip/libopenjpip/jpip_parser.c b/src/lib/openjpip/jpip_parser.c
similarity index 100%
rename from applications/jpip/libopenjpip/jpip_parser.c
rename to src/lib/openjpip/jpip_parser.c
diff --git a/applications/jpip/libopenjpip/jpip_parser.h b/src/lib/openjpip/jpip_parser.h
similarity index 100%
rename from applications/jpip/libopenjpip/jpip_parser.h
rename to src/lib/openjpip/jpip_parser.h
diff --git a/applications/jpip/libopenjpip/jpipstream_manager.c b/src/lib/openjpip/jpipstream_manager.c
similarity index 100%
rename from applications/jpip/libopenjpip/jpipstream_manager.c
rename to src/lib/openjpip/jpipstream_manager.c
diff --git a/applications/jpip/libopenjpip/jpipstream_manager.h b/src/lib/openjpip/jpipstream_manager.h
similarity index 100%
rename from applications/jpip/libopenjpip/jpipstream_manager.h
rename to src/lib/openjpip/jpipstream_manager.h
diff --git a/applications/jpip/libopenjpip/manfbox_manager.c b/src/lib/openjpip/manfbox_manager.c
similarity index 100%
rename from applications/jpip/libopenjpip/manfbox_manager.c
rename to src/lib/openjpip/manfbox_manager.c
diff --git a/applications/jpip/libopenjpip/manfbox_manager.h b/src/lib/openjpip/manfbox_manager.h
similarity index 100%
rename from applications/jpip/libopenjpip/manfbox_manager.h
rename to src/lib/openjpip/manfbox_manager.h
diff --git a/applications/jpip/libopenjpip/marker_manager.c b/src/lib/openjpip/marker_manager.c
similarity index 100%
rename from applications/jpip/libopenjpip/marker_manager.c
rename to src/lib/openjpip/marker_manager.c
diff --git a/applications/jpip/libopenjpip/marker_manager.h b/src/lib/openjpip/marker_manager.h
similarity index 100%
rename from applications/jpip/libopenjpip/marker_manager.h
rename to src/lib/openjpip/marker_manager.h
diff --git a/applications/jpip/libopenjpip/metadata_manager.c b/src/lib/openjpip/metadata_manager.c
similarity index 100%
rename from applications/jpip/libopenjpip/metadata_manager.c
rename to src/lib/openjpip/metadata_manager.c
diff --git a/applications/jpip/libopenjpip/metadata_manager.h b/src/lib/openjpip/metadata_manager.h
similarity index 100%
rename from applications/jpip/libopenjpip/metadata_manager.h
rename to src/lib/openjpip/metadata_manager.h
diff --git a/applications/jpip/libopenjpip/mhixbox_manager.c b/src/lib/openjpip/mhixbox_manager.c
similarity index 100%
rename from applications/jpip/libopenjpip/mhixbox_manager.c
rename to src/lib/openjpip/mhixbox_manager.c
diff --git a/applications/jpip/libopenjpip/mhixbox_manager.h b/src/lib/openjpip/mhixbox_manager.h
similarity index 100%
rename from applications/jpip/libopenjpip/mhixbox_manager.h
rename to src/lib/openjpip/mhixbox_manager.h
diff --git a/applications/jpip/libopenjpip/msgqueue_manager.c b/src/lib/openjpip/msgqueue_manager.c
similarity index 100%
rename from applications/jpip/libopenjpip/msgqueue_manager.c
rename to src/lib/openjpip/msgqueue_manager.c
diff --git a/applications/jpip/libopenjpip/msgqueue_manager.h b/src/lib/openjpip/msgqueue_manager.h
similarity index 100%
rename from applications/jpip/libopenjpip/msgqueue_manager.h
rename to src/lib/openjpip/msgqueue_manager.h
diff --git a/applications/jpip/libopenjpip/openjpip.c b/src/lib/openjpip/openjpip.c
similarity index 100%
rename from applications/jpip/libopenjpip/openjpip.c
rename to src/lib/openjpip/openjpip.c
diff --git a/applications/jpip/libopenjpip/openjpip.h b/src/lib/openjpip/openjpip.h
similarity index 100%
rename from applications/jpip/libopenjpip/openjpip.h
rename to src/lib/openjpip/openjpip.h
diff --git a/applications/jpip/libopenjpip/placeholder_manager.c b/src/lib/openjpip/placeholder_manager.c
similarity index 100%
rename from applications/jpip/libopenjpip/placeholder_manager.c
rename to src/lib/openjpip/placeholder_manager.c
diff --git a/applications/jpip/libopenjpip/placeholder_manager.h b/src/lib/openjpip/placeholder_manager.h
similarity index 100%
rename from applications/jpip/libopenjpip/placeholder_manager.h
rename to src/lib/openjpip/placeholder_manager.h
diff --git a/applications/jpip/libopenjpip/query_parser.c b/src/lib/openjpip/query_parser.c
similarity index 100%
rename from applications/jpip/libopenjpip/query_parser.c
rename to src/lib/openjpip/query_parser.c
diff --git a/applications/jpip/libopenjpip/query_parser.h b/src/lib/openjpip/query_parser.h
similarity index 100%
rename from applications/jpip/libopenjpip/query_parser.h
rename to src/lib/openjpip/query_parser.h
diff --git a/applications/jpip/libopenjpip/session_manager.c b/src/lib/openjpip/session_manager.c
similarity index 100%
rename from applications/jpip/libopenjpip/session_manager.c
rename to src/lib/openjpip/session_manager.c
diff --git a/applications/jpip/libopenjpip/session_manager.h b/src/lib/openjpip/session_manager.h
similarity index 100%
rename from applications/jpip/libopenjpip/session_manager.h
rename to src/lib/openjpip/session_manager.h
diff --git a/applications/jpip/libopenjpip/sock_manager.c b/src/lib/openjpip/sock_manager.c
similarity index 100%
rename from applications/jpip/libopenjpip/sock_manager.c
rename to src/lib/openjpip/sock_manager.c
diff --git a/applications/jpip/libopenjpip/sock_manager.h b/src/lib/openjpip/sock_manager.h
similarity index 100%
rename from applications/jpip/libopenjpip/sock_manager.h
rename to src/lib/openjpip/sock_manager.h
diff --git a/applications/jpip/libopenjpip/target_manager.c b/src/lib/openjpip/target_manager.c
similarity index 100%
rename from applications/jpip/libopenjpip/target_manager.c
rename to src/lib/openjpip/target_manager.c
diff --git a/applications/jpip/libopenjpip/target_manager.h b/src/lib/openjpip/target_manager.h
similarity index 100%
rename from applications/jpip/libopenjpip/target_manager.h
rename to src/lib/openjpip/target_manager.h
diff --git a/src/lib/openjpwl/CMakeLists.txt b/src/lib/openjpwl/CMakeLists.txt
new file mode 100644
index 00000000..eccef4b5
--- /dev/null
+++ b/src/lib/openjpwl/CMakeLists.txt
@@ -0,0 +1,63 @@
+# Makefile for the main JPWL OpenJPEG codecs: JPWL_ j2k_to_image and JPWL_image_to_j2k
+
+add_definitions(-DUSE_JPWL)
+
+set(OPENJPEG_SRCS
+  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/bio.c
+  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/cio.c
+  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/dwt.c
+  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/event.c
+  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/image.c
+  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/j2k.c
+  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/j2k_lib.c
+  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/jp2.c
+  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/jpt.c
+  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/mct.c
+  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/mqc.c
+  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/openjpeg.c
+  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/pi.c
+  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/raw.c
+  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/t1.c
+  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/t2.c
+  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/tcd.c
+  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/tgt.c
+  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/cidx_manager.c
+  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/phix_manager.c
+  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/ppix_manager.c
+  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/thix_manager.c
+  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/tpix_manager.c
+  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/function_list.c
+)
+
+set(JPWL_SRCS crc.c jpwl.c jpwl_lib.c rs.c)
+if(APPLE)
+  set_source_files_properties(
+    rs.c
+    PROPERTIES
+    COMPILE_FLAGS -fno-common)
+endif()
+
+include_directories(
+  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2
+  ${OPENJPEG_SOURCE_DIR}/src/lib
+  )
+
+# Build the library
+if(WIN32)
+  if(BUILD_SHARED_LIBS)
+    add_definitions(-DOPJ_EXPORTS)
+  else()
+    add_definitions(-DOPJ_STATIC)
+  endif()
+endif()
+add_library(${OPENJPEG_LIBRARY_NAME}_JPWL ${JPWL_SRCS} ${OPENJPEG_SRCS})
+set_target_properties(${OPENJPEG_LIBRARY_NAME}_JPWL
+  PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES})
+
+# Install library
+install(TARGETS ${OPENJPEG_LIBRARY_NAME}_JPWL
+  EXPORT OpenJPEGTargets
+  RUNTIME DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
+  LIBRARY DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
+  ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
+)
diff --git a/libopenjpeg/jpwl/Makefile.am b/src/lib/openjpwl/Makefile.am
similarity index 100%
rename from libopenjpeg/jpwl/Makefile.am
rename to src/lib/openjpwl/Makefile.am
diff --git a/libopenjpeg/jpwl/README.txt b/src/lib/openjpwl/README.txt
similarity index 100%
rename from libopenjpeg/jpwl/README.txt
rename to src/lib/openjpwl/README.txt
diff --git a/libopenjpeg/jpwl/crc.c b/src/lib/openjpwl/crc.c
similarity index 100%
rename from libopenjpeg/jpwl/crc.c
rename to src/lib/openjpwl/crc.c
diff --git a/libopenjpeg/jpwl/crc.h b/src/lib/openjpwl/crc.h
similarity index 100%
rename from libopenjpeg/jpwl/crc.h
rename to src/lib/openjpwl/crc.h
diff --git a/libopenjpeg/jpwl/jpwl.c b/src/lib/openjpwl/jpwl.c
similarity index 100%
rename from libopenjpeg/jpwl/jpwl.c
rename to src/lib/openjpwl/jpwl.c
diff --git a/libopenjpeg/jpwl/jpwl.h b/src/lib/openjpwl/jpwl.h
similarity index 100%
rename from libopenjpeg/jpwl/jpwl.h
rename to src/lib/openjpwl/jpwl.h
diff --git a/libopenjpeg/jpwl/jpwl_lib.c b/src/lib/openjpwl/jpwl_lib.c
similarity index 100%
rename from libopenjpeg/jpwl/jpwl_lib.c
rename to src/lib/openjpwl/jpwl_lib.c
diff --git a/libopenjpeg/jpwl/rs.c b/src/lib/openjpwl/rs.c
similarity index 100%
rename from libopenjpeg/jpwl/rs.c
rename to src/lib/openjpwl/rs.c
diff --git a/libopenjpeg/jpwl/rs.h b/src/lib/openjpwl/rs.h
similarity index 100%
rename from libopenjpeg/jpwl/rs.h
rename to src/lib/openjpwl/rs.h
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 444f9b4c..a34963f9 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,8 +1,8 @@
 # Tests
 include_directories(
-  ${OPENJPEG_SOURCE_DIR}/libopenjpeg
-  ${OPENJPEG_SOURCE_DIR}/applications/codec
-  ${OPENJPEG_SOURCE_DIR}/applications/common
+  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2
+  ${OPENJPEG_SOURCE_DIR}/src/bin/jp2
+  ${OPENJPEG_SOURCE_DIR}/src/bin/common
   ${Z_INCLUDE_DIRNAME}
   ${PNG_INCLUDE_DIRNAME}
   ${TIFF_INCLUDE_DIRNAME}
@@ -10,15 +10,15 @@ include_directories(
 
 # First thing define the common source:
 set(comparePGXimages_SRCS comparePGXimages.c
-  ${OPENJPEG_SOURCE_DIR}/applications/codec/convert.c
-  ${OPENJPEG_SOURCE_DIR}/applications/common/opj_getopt.c
+  ${OPENJPEG_SOURCE_DIR}/src/bin/jp2/convert.c
+  ${OPENJPEG_SOURCE_DIR}/src/bin/common/opj_getopt.c
   )
 
 set(compare_dump_files_SRCS compare_dump_files.c
-  ${OPENJPEG_SOURCE_DIR}/applications/common/opj_getopt.c)
+  ${OPENJPEG_SOURCE_DIR}/src/bin/common/opj_getopt.c)
 
 set(compareRAWimages_SRCS compareRAWimages.c
-  ${OPENJPEG_SOURCE_DIR}/applications/common/opj_getopt.c)
+  ${OPENJPEG_SOURCE_DIR}/src/bin/common/opj_getopt.c)
 
 add_executable(comparePGXimages ${comparePGXimages_SRCS})
 target_link_libraries(comparePGXimages
diff --git a/applications/JavaOpenJPEG/CMakeLists.txt b/wrapping/java/openjp2/CMakeLists.txt
similarity index 100%
rename from applications/JavaOpenJPEG/CMakeLists.txt
rename to wrapping/java/openjp2/CMakeLists.txt
diff --git a/applications/JavaOpenJPEG/JavaOpenJPEG.c b/wrapping/java/openjp2/JavaOpenJPEG.c
similarity index 100%
rename from applications/JavaOpenJPEG/JavaOpenJPEG.c
rename to wrapping/java/openjp2/JavaOpenJPEG.c
diff --git a/applications/JavaOpenJPEG/JavaOpenJPEGDecoder.c b/wrapping/java/openjp2/JavaOpenJPEGDecoder.c
similarity index 100%
rename from applications/JavaOpenJPEG/JavaOpenJPEGDecoder.c
rename to wrapping/java/openjp2/JavaOpenJPEGDecoder.c
diff --git a/applications/JavaOpenJPEG/java-sources/org/openJpeg/OpenJPEGJavaDecoder.java b/wrapping/java/openjp2/java-sources/org/openJpeg/OpenJPEGJavaDecoder.java
similarity index 100%
rename from applications/JavaOpenJPEG/java-sources/org/openJpeg/OpenJPEGJavaDecoder.java
rename to wrapping/java/openjp2/java-sources/org/openJpeg/OpenJPEGJavaDecoder.java
diff --git a/applications/JavaOpenJPEG/java-sources/org/openJpeg/OpenJPEGJavaEncoder.java b/wrapping/java/openjp2/java-sources/org/openJpeg/OpenJPEGJavaEncoder.java
similarity index 100%
rename from applications/JavaOpenJPEG/java-sources/org/openJpeg/OpenJPEGJavaEncoder.java
rename to wrapping/java/openjp2/java-sources/org/openJpeg/OpenJPEGJavaEncoder.java
diff --git a/applications/JavaOpenJPEG/org_openJpeg_OpenJPEGJavaDecoder.h b/wrapping/java/openjp2/org_openJpeg_OpenJPEGJavaDecoder.h
similarity index 100%
rename from applications/JavaOpenJPEG/org_openJpeg_OpenJPEGJavaDecoder.h
rename to wrapping/java/openjp2/org_openJpeg_OpenJPEGJavaDecoder.h
diff --git a/applications/JavaOpenJPEG/org_openJpeg_OpenJPEGJavaEncoder.h b/wrapping/java/openjp2/org_openJpeg_OpenJPEGJavaEncoder.h
similarity index 100%
rename from applications/JavaOpenJPEG/org_openJpeg_OpenJPEGJavaEncoder.h
rename to wrapping/java/openjp2/org_openJpeg_OpenJPEGJavaEncoder.h