246 files changed, 151 insertions, 96 deletions
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
index d92f5ec5..d92f5ec5 100644
--- a/CMake/CTestCustom.cmake.in
+++ b/cmake/CTestCustom.cmake.in
diff --git a/CMake/FindCPPCHECK.cmake b/cmake/FindCPPCHECK.cmake
index 6e11bf73..6e11bf73 100644
--- a/CMake/FindCPPCHECK.cmake
+++ b/cmake/FindCPPCHECK.cmake
diff --git a/CMake/FindFCGI.cmake b/cmake/FindFCGI.cmake
index 309bdd4d..309bdd4d 100644
--- a/CMake/FindFCGI.cmake
+++ b/cmake/FindFCGI.cmake
diff --git a/CMake/FindKAKADU.cmake b/cmake/FindKAKADU.cmake
index 3e0409df..3e0409df 100644
--- a/CMake/FindKAKADU.cmake
+++ b/cmake/FindKAKADU.cmake
diff --git a/CMake/FindLCMS.cmake b/cmake/FindLCMS.cmake
index e659895d..e659895d 100644
--- a/CMake/FindLCMS.cmake
+++ b/cmake/FindLCMS.cmake
diff --git a/CMake/FindLCMS2.cmake b/cmake/FindLCMS2.cmake
index 65b6525c..65b6525c 100644
--- a/CMake/FindLCMS2.cmake
+++ b/cmake/FindLCMS2.cmake
diff --git a/CMake/JPIPTestDriver.cmake b/cmake/JPIPTestDriver.cmake
index 2147c464..2147c464 100644
--- a/CMake/JPIPTestDriver.cmake
+++ b/cmake/JPIPTestDriver.cmake
diff --git a/CMake/OpenJPEGCPack.cmake b/cmake/OpenJPEGCPack.cmake
index 1a40ff17..1a40ff17 100644
--- a/CMake/OpenJPEGCPack.cmake
+++ b/cmake/OpenJPEGCPack.cmake
diff --git a/CMake/OpenJPEGConfig.cmake.in b/cmake/OpenJPEGConfig.cmake.in
index b20294ca..b20294ca 100644
--- a/CMake/OpenJPEGConfig.cmake.in
+++ b/cmake/OpenJPEGConfig.cmake.in
diff --git a/CMake/TestFileOffsetBits.c b/cmake/TestFileOffsetBits.c
index 993b2da4..993b2da4 100644
--- a/CMake/TestFileOffsetBits.c
+++ b/cmake/TestFileOffsetBits.c
diff --git a/CMake/TestLargeFiles.c.cmake.in b/cmake/TestLargeFiles.c.cmake.in
index 623f95f8..623f95f8 100644
--- a/CMake/TestLargeFiles.c.cmake.in
+++ b/cmake/TestLargeFiles.c.cmake.in
diff --git a/CMake/TestLargeFiles.cmake b/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
index ad9f0be1..ad9f0be1 100644
--- a/CMake/TestWindowsFSeek.c
+++ b/cmake/TestWindowsFSeek.c
diff --git a/CMake/openjpeg_valgrind.supp b/cmake/openjpeg_valgrind.supp
index f1076469..f1076469 100644
--- a/CMake/openjpeg_valgrind.supp
+++ b/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
--- /dev/null
+++ b/src/bin/common/CMakeLists.txt
diff --git a/applications/common/color.c b/src/bin/common/color.c
index 21b02156..21b02156 100644
--- a/applications/common/color.c
+++ b/src/bin/common/color.c
diff --git a/applications/common/color.h b/src/bin/common/color.h
index 26117b02..26117b02 100644
--- a/applications/common/color.h
+++ b/src/bin/common/color.h
diff --git a/applications/common/format_defs.h b/src/bin/common/format_defs.h
index e82986cc..e82986cc 100644
--- a/applications/common/format_defs.h
+++ b/src/bin/common/format_defs.h
diff --git a/applications/common/opj_getopt.c b/src/bin/common/opj_getopt.c
index 252d8359..252d8359 100644
--- a/applications/common/opj_getopt.c
+++ b/src/bin/common/opj_getopt.c
diff --git a/applications/common/opj_getopt.h b/src/bin/common/opj_getopt.h
index e1f41a56..e1f41a56 100644
--- a/applications/common/opj_getopt.h
+++ b/src/bin/common/opj_getopt.h
diff --git a/applications/codec/CMakeLists.txt b/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
index 17be3b88..17be3b88 100644
--- a/applications/codec/Makefile.am
+++ b/src/bin/jp2/Makefile.am
diff --git a/applications/codec/README b/src/bin/jp2/README
index 80049980..80049980 100644
--- a/applications/codec/README
+++ b/src/bin/jp2/README
diff --git a/applications/codec/convert.c b/src/bin/jp2/convert.c
index 59af469b..59af469b 100644
--- a/applications/codec/convert.c
+++ b/src/bin/jp2/convert.c
diff --git a/applications/codec/convert.h b/src/bin/jp2/convert.h
index 72ed981d..72ed981d 100644
--- a/applications/codec/convert.h
+++ b/src/bin/jp2/convert.h
diff --git a/applications/codec/image_to_j2k.c b/src/bin/jp2/image_to_j2k.c
index 343ea557..343ea557 100644
--- a/applications/codec/image_to_j2k.c
+++ b/src/bin/jp2/image_to_j2k.c
diff --git a/applications/codec/index.c b/src/bin/jp2/index.c
index c71730fe..c71730fe 100644
--- a/applications/codec/index.c
+++ b/src/bin/jp2/index.c
diff --git a/applications/codec/index.h b/src/bin/jp2/index.h
index 6c2231dd..6c2231dd 100644
--- a/applications/codec/index.h
+++ b/src/bin/jp2/index.h
diff --git a/applications/codec/j2k_dump.c b/src/bin/jp2/j2k_dump.c
index 6c63c2ca..6c63c2ca 100644
--- a/applications/codec/j2k_dump.c
+++ b/src/bin/jp2/j2k_dump.c
diff --git a/applications/codec/j2k_to_image.c b/src/bin/jp2/j2k_to_image.c
index 7edb3c9b..7edb3c9b 100644
--- a/applications/codec/j2k_to_image.c
+++ b/src/bin/jp2/j2k_to_image.c
diff --git a/applications/codec/windirent.h b/src/bin/jp2/windirent.h
index 944b7d71..944b7d71 100644
--- a/applications/codec/windirent.h
+++ b/src/bin/jp2/windirent.h
diff --git a/applications/jpip/util/CMakeLists.txt b/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
index 0e98b71e..0e98b71e 100644
--- a/applications/jpip/util/Makefile.am
+++ b/src/bin/jpip/Makefile.am
diff --git a/applications/jpip/util/addXMLinJP2.c b/src/bin/jpip/addXMLinJP2.c
index f136e913..f136e913 100644
--- a/applications/jpip/util/addXMLinJP2.c
+++ b/src/bin/jpip/addXMLinJP2.c
diff --git a/applications/jpip/util/jpip_to_j2k.c b/src/bin/jpip/jpip_to_j2k.c
index d8b2e2b0..d8b2e2b0 100644
--- a/applications/jpip/util/jpip_to_j2k.c
+++ b/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
index d667ed9d..d667ed9d 100644
--- a/applications/jpip/util/jpip_to_jp2.c
+++ b/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
index b41ef0c9..b41ef0c9 100644
--- a/applications/jpip/util/opj_dec_server.c
+++ b/src/bin/jpip/opj_dec_server.c
diff --git a/applications/jpip/util/opj_server.c b/src/bin/jpip/opj_server.c
index 1666a94f..1666a94f 100644
--- a/applications/jpip/util/opj_server.c
+++ b/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
index 537c33dd..537c33dd 100644
--- a/applications/jpip/util/opj_viewer/dist/manifest.txt
+++ b/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
index aad3ffaa..aad3ffaa 100644
--- a/applications/jpip/util/opj_viewer/src/ImageManager.java
+++ b/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
index 163193b9..163193b9 100644
--- a/applications/jpip/util/opj_viewer/src/ImageViewer.java
+++ b/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
index 9a236e4a..9a236e4a 100644
--- a/applications/jpip/util/opj_viewer/src/ImageWindow.java
+++ b/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
index edb64ded..edb64ded 100644
--- a/applications/jpip/util/opj_viewer/src/ImgdecClient.java
+++ b/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
index ce9a301d..ce9a301d 100644
--- a/applications/jpip/util/opj_viewer/src/JPIPHttpClient.java
+++ b/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
index 983ff200..983ff200 100644
--- a/applications/jpip/util/opj_viewer/src/MML.java
+++ b/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
index 092acecb..092acecb 100644
--- a/applications/jpip/util/opj_viewer/src/PnmImage.java
+++ b/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
index 57c54c57..57c54c57 100644
--- a/applications/jpip/util/opj_viewer/src/RegimViewer.java
+++ b/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
index fce8a4ff..fce8a4ff 100644
--- a/applications/jpip/util/opj_viewer/src/ResizeListener.java
+++ b/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
index c7ba9f36..c7ba9f36 100644
--- a/applications/jpip/util/opj_viewer_xerces/dist/manifest.txt.in
+++ b/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
index 52f0522a..52f0522a 100644
--- a/applications/jpip/util/opj_viewer_xerces/src/ImageViewer.java
+++ b/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
index ae3f54c5..ae3f54c5 100644
--- a/applications/jpip/util/opj_viewer_xerces/src/ImageWindow.java
+++ b/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
index bec1d4db..bec1d4db 100644
--- a/applications/jpip/util/opj_viewer_xerces/src/JP2XMLparser.java
+++ b/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
index 822e2dd8..822e2dd8 100644
--- a/applications/jpip/util/opj_viewer_xerces/src/OptionPanel.java
+++ b/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
index 1a22c1eb..1a22c1eb 100644
--- a/applications/jpip/util/test_index.c
+++ b/src/bin/jpip/test_index.c
diff --git a/applications/mj2/CMakeLists.txt b/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
index cff65660..cff65660 100644
--- a/applications/mj2/Makefile.am
+++ b/src/bin/mj2/Makefile.am
diff --git a/applications/mj2/extract_j2k_from_mj2.c b/src/bin/mj2/extract_j2k_from_mj2.c
index f694d531..f694d531 100644
--- a/applications/mj2/extract_j2k_from_mj2.c
+++ b/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
index dff34ab7..dff34ab7 100644
--- a/applications/mj2/frames_to_mj2.c
+++ b/src/bin/mj2/frames_to_mj2.c
diff --git a/applications/mj2/meta_out.c b/src/bin/mj2/meta_out.c
index b6795045..b6795045 100644
--- a/applications/mj2/meta_out.c
+++ b/src/bin/mj2/meta_out.c
diff --git a/applications/mj2/meta_out.h b/src/bin/mj2/meta_out.h
index 293316d1..293316d1 100644
--- a/applications/mj2/meta_out.h
+++ b/src/bin/mj2/meta_out.h
diff --git a/applications/mj2/mj2.c b/src/bin/mj2/mj2.c
index f5ab5f3f..f5ab5f3f 100644
--- a/applications/mj2/mj2.c
+++ b/src/bin/mj2/mj2.c
diff --git a/applications/mj2/mj2.h b/src/bin/mj2/mj2.h
index c0255707..c0255707 100644
--- a/applications/mj2/mj2.h
+++ b/src/bin/mj2/mj2.h
diff --git a/applications/mj2/mj2_convert.c b/src/bin/mj2/mj2_convert.c
index ed823f8b..ed823f8b 100644
--- a/applications/mj2/mj2_convert.c
+++ b/src/bin/mj2/mj2_convert.c
diff --git a/applications/mj2/mj2_convert.h b/src/bin/mj2/mj2_convert.h
index 736ef80c..736ef80c 100644
--- a/applications/mj2/mj2_convert.h
+++ b/src/bin/mj2/mj2_convert.h
diff --git a/applications/mj2/mj2_to_frames.c b/src/bin/mj2/mj2_to_frames.c
index 32679198..32679198 100644
--- a/applications/mj2/mj2_to_frames.c
+++ b/src/bin/mj2/mj2_to_frames.c
diff --git a/applications/mj2/mj2_to_metadata.c b/src/bin/mj2/mj2_to_metadata.c
index 489f19cb..489f19cb 100644
--- a/applications/mj2/mj2_to_metadata.c
+++ b/src/bin/mj2/mj2_to_metadata.c
diff --git a/applications/mj2/mj2_to_metadata.dtd b/src/bin/mj2/mj2_to_metadata.dtd
index 249de1a0..249de1a0 100644
--- a/applications/mj2/mj2_to_metadata.dtd
+++ b/src/bin/mj2/mj2_to_metadata.dtd
diff --git a/applications/mj2/mj2_to_metadata.h b/src/bin/mj2/mj2_to_metadata.h
index f4c34919..f4c34919 100644
--- a/applications/mj2/mj2_to_metadata.h
+++ b/src/bin/mj2/mj2_to_metadata.h
diff --git a/applications/mj2/mj2_to_metadata.sln b/src/bin/mj2/mj2_to_metadata.sln
index 32b926d4..32b926d4 100644
--- a/applications/mj2/mj2_to_metadata.sln
+++ b/src/bin/mj2/mj2_to_metadata.sln
diff --git a/applications/mj2/mj2_to_metadata.vcproj b/src/bin/mj2/mj2_to_metadata.vcproj
index b280bfe5..b280bfe5 100644
--- a/applications/mj2/mj2_to_metadata.vcproj
+++ b/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
index 05ccec20..05ccec20 100644
--- a/applications/mj2/mj2_to_metadata_Notes.doc
+++ b/src/bin/mj2/mj2_to_metadata_Notes.doc
diff --git a/applications/mj2/readme.txt b/src/bin/mj2/readme.txt
index 9419d2a2..9419d2a2 100644
--- a/applications/mj2/readme.txt
+++ b/src/bin/mj2/readme.txt
diff --git a/applications/mj2/wrap_j2k_in_mj2.c b/src/bin/mj2/wrap_j2k_in_mj2.c
index 7ce88677..7ce88677 100644
--- a/applications/mj2/wrap_j2k_in_mj2.c
+++ b/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
--- /dev/null
+++ b/src/bin/wx/CMakeLists.txt
diff --git a/applications/OPJViewer/CMakeLists.txt b/src/bin/wx/OPJViewer/CMakeLists.txt
index 34442848..34442848 100644
--- a/applications/OPJViewer/CMakeLists.txt
+++ b/src/bin/wx/OPJViewer/CMakeLists.txt
diff --git a/applications/OPJViewer/OPJViewer.iss b/src/bin/wx/OPJViewer/OPJViewer.iss
index 0cf20da9..0cf20da9 100644
--- a/applications/OPJViewer/OPJViewer.iss
+++ b/src/bin/wx/OPJViewer/OPJViewer.iss
diff --git a/applications/OPJViewer/Readme.txt b/src/bin/wx/OPJViewer/Readme.txt
index fe104bbf..fe104bbf 100644
--- a/applications/OPJViewer/Readme.txt
+++ b/src/bin/wx/OPJViewer/Readme.txt
diff --git a/applications/OPJViewer/about/about.htm b/src/bin/wx/OPJViewer/about/about.htm
index cdde9773..cdde9773 100644
--- a/applications/OPJViewer/about/about.htm
+++ b/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
index 0f43840a..0f43840a 100644
--- a/applications/OPJViewer/about/opj_logo.png
+++ b/src/bin/wx/OPJViewer/about/opj_logo.png
diff --git a/applications/OPJViewer/source/OPJAbout.cpp b/src/bin/wx/OPJViewer/source/OPJAbout.cpp
index f988c727..f988c727 100644
--- a/applications/OPJViewer/source/OPJAbout.cpp
+++ b/src/bin/wx/OPJViewer/source/OPJAbout.cpp
diff --git a/applications/OPJViewer/source/OPJChild.ico b/src/bin/wx/OPJViewer/source/OPJChild.ico
index 7a127189..7a127189 100644
--- a/applications/OPJViewer/source/OPJChild.ico
+++ b/src/bin/wx/OPJViewer/source/OPJChild.ico
diff --git a/applications/OPJViewer/source/OPJChild16.xpm b/src/bin/wx/OPJViewer/source/OPJChild16.xpm
index 99b7b2cf..99b7b2cf 100644
--- a/applications/OPJViewer/source/OPJChild16.xpm
+++ b/src/bin/wx/OPJViewer/source/OPJChild16.xpm
diff --git a/applications/OPJViewer/source/OPJDialogs.cpp b/src/bin/wx/OPJViewer/source/OPJDialogs.cpp
index ff96da9c..ff96da9c 100644
--- a/applications/OPJViewer/source/OPJDialogs.cpp
+++ b/src/bin/wx/OPJViewer/source/OPJDialogs.cpp
diff --git a/applications/OPJViewer/source/OPJThreads.cpp b/src/bin/wx/OPJViewer/source/OPJThreads.cpp
index 14159ac9..14159ac9 100644
--- a/applications/OPJViewer/source/OPJThreads.cpp
+++ b/src/bin/wx/OPJViewer/source/OPJThreads.cpp
diff --git a/applications/OPJViewer/source/OPJViewer.cpp b/src/bin/wx/OPJViewer/source/OPJViewer.cpp
index 8476d919..8476d919 100644
--- a/applications/OPJViewer/source/OPJViewer.cpp
+++ b/src/bin/wx/OPJViewer/source/OPJViewer.cpp
diff --git a/applications/OPJViewer/source/OPJViewer.h b/src/bin/wx/OPJViewer/source/OPJViewer.h
index ecc48b62..ecc48b62 100644
--- a/applications/OPJViewer/source/OPJViewer.h
+++ b/src/bin/wx/OPJViewer/source/OPJViewer.h
diff --git a/applications/OPJViewer/source/OPJViewer.ico b/src/bin/wx/OPJViewer/source/OPJViewer.ico
index 931d5e02..931d5e02 100644
--- a/applications/OPJViewer/source/OPJViewer.ico
+++ b/src/bin/wx/OPJViewer/source/OPJViewer.ico
diff --git a/applications/OPJViewer/source/OPJViewer.rc b/src/bin/wx/OPJViewer/source/OPJViewer.rc
index 82af985b..82af985b 100644
--- a/applications/OPJViewer/source/OPJViewer.rc
+++ b/src/bin/wx/OPJViewer/source/OPJViewer.rc
diff --git a/applications/OPJViewer/source/OPJViewer16.xpm b/src/bin/wx/OPJViewer/source/OPJViewer16.xpm
index 7c65acb3..7c65acb3 100644
--- a/applications/OPJViewer/source/OPJViewer16.xpm
+++ b/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
index 79a859d8..79a859d8 100644
--- a/applications/OPJViewer/source/about_htm.h
+++ b/src/bin/wx/OPJViewer/source/about_htm.h
diff --git a/applications/OPJViewer/source/build.h b/src/bin/wx/OPJViewer/source/build.h
index f0f072c8..f0f072c8 100644
--- a/applications/OPJViewer/source/build.h
+++ b/src/bin/wx/OPJViewer/source/build.h
diff --git a/applications/OPJViewer/source/icon1.xpm b/src/bin/wx/OPJViewer/source/icon1.xpm
index 69131fb5..69131fb5 100644
--- a/applications/OPJViewer/source/icon1.xpm
+++ b/src/bin/wx/OPJViewer/source/icon1.xpm
diff --git a/applications/OPJViewer/source/icon2.xpm b/src/bin/wx/OPJViewer/source/icon2.xpm
index cb8f1032..cb8f1032 100644
--- a/applications/OPJViewer/source/icon2.xpm
+++ b/src/bin/wx/OPJViewer/source/icon2.xpm
diff --git a/applications/OPJViewer/source/icon3.xpm b/src/bin/wx/OPJViewer/source/icon3.xpm
index ddfa18b9..ddfa18b9 100644
--- a/applications/OPJViewer/source/icon3.xpm
+++ b/src/bin/wx/OPJViewer/source/icon3.xpm
diff --git a/applications/OPJViewer/source/icon4.xpm b/src/bin/wx/OPJViewer/source/icon4.xpm
index 37f95798..37f95798 100644
--- a/applications/OPJViewer/source/icon4.xpm
+++ b/src/bin/wx/OPJViewer/source/icon4.xpm
diff --git a/applications/OPJViewer/source/icon5.xpm b/src/bin/wx/OPJViewer/source/icon5.xpm
index d4e8b118..d4e8b118 100644
--- a/applications/OPJViewer/source/icon5.xpm
+++ b/src/bin/wx/OPJViewer/source/icon5.xpm
diff --git a/applications/OPJViewer/source/imagjpeg2000.cpp b/src/bin/wx/OPJViewer/source/imagjpeg2000.cpp
index ee2aa74d..ee2aa74d 100644
--- a/applications/OPJViewer/source/imagjpeg2000.cpp
+++ b/src/bin/wx/OPJViewer/source/imagjpeg2000.cpp
diff --git a/applications/OPJViewer/source/imagjpeg2000.h b/src/bin/wx/OPJViewer/source/imagjpeg2000.h
index 609a3063..609a3063 100644
--- a/applications/OPJViewer/source/imagjpeg2000.h
+++ b/src/bin/wx/OPJViewer/source/imagjpeg2000.h
diff --git a/applications/OPJViewer/source/imagmxf.cpp b/src/bin/wx/OPJViewer/source/imagmxf.cpp
index ccfa9f9f..ccfa9f9f 100644
--- a/applications/OPJViewer/source/imagmxf.cpp
+++ b/src/bin/wx/OPJViewer/source/imagmxf.cpp
diff --git a/applications/OPJViewer/source/imagmxf.h b/src/bin/wx/OPJViewer/source/imagmxf.h
index 62158b4f..62158b4f 100644
--- a/applications/OPJViewer/source/imagmxf.h
+++ b/src/bin/wx/OPJViewer/source/imagmxf.h
diff --git a/applications/OPJViewer/source/license.txt b/src/bin/wx/OPJViewer/source/license.txt
index 6409db44..6409db44 100644
--- a/applications/OPJViewer/source/license.txt
+++ b/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
index c64d0a7b..c64d0a7b 100644
--- a/applications/OPJViewer/source/opj_logo.xpm
+++ b/src/bin/wx/OPJViewer/source/opj_logo.xpm
diff --git a/applications/OPJViewer/source/readmeafter.txt b/src/bin/wx/OPJViewer/source/readmeafter.txt
index 87c122be..87c122be 100644
--- a/applications/OPJViewer/source/readmeafter.txt
+++ b/src/bin/wx/OPJViewer/source/readmeafter.txt
diff --git a/applications/OPJViewer/source/readmebefore.txt b/src/bin/wx/OPJViewer/source/readmebefore.txt
index a59b0e87..a59b0e87 100644
--- a/applications/OPJViewer/source/readmebefore.txt
+++ b/src/bin/wx/OPJViewer/source/readmebefore.txt
diff --git a/applications/OPJViewer/source/wxj2kparser.cpp b/src/bin/wx/OPJViewer/source/wxj2kparser.cpp
index 284c568a..284c568a 100644
--- a/applications/OPJViewer/source/wxj2kparser.cpp
+++ b/src/bin/wx/OPJViewer/source/wxj2kparser.cpp
diff --git a/applications/OPJViewer/source/wxjp2parser.cpp b/src/bin/wx/OPJViewer/source/wxjp2parser.cpp
index 182def8b..182def8b 100644
--- a/applications/OPJViewer/source/wxjp2parser.cpp
+++ b/src/bin/wx/OPJViewer/source/wxjp2parser.cpp
diff --git a/libopenjpeg/CMakeLists.txt b/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
index 2fb79f9f..2fb79f9f 100644
--- a/libopenjpeg/Makefile.am
+++ b/src/lib/openjp2/Makefile.am
diff --git a/libopenjpeg/bio.c b/src/lib/openjp2/bio.c
index 0bf601bb..0bf601bb 100644
--- a/libopenjpeg/bio.c
+++ b/src/lib/openjp2/bio.c
diff --git a/libopenjpeg/bio.h b/src/lib/openjp2/bio.h
index 61191f7d..61191f7d 100644
--- a/libopenjpeg/bio.h
+++ b/src/lib/openjp2/bio.h
diff --git a/libopenjpeg/cidx_manager.c b/src/lib/openjp2/cidx_manager.c
index f3b251ff..f3b251ff 100644
--- a/libopenjpeg/cidx_manager.c
+++ b/src/lib/openjp2/cidx_manager.c
diff --git a/libopenjpeg/cidx_manager.h b/src/lib/openjp2/cidx_manager.h
index 23eebd52..23eebd52 100644
--- a/libopenjpeg/cidx_manager.h
+++ b/src/lib/openjp2/cidx_manager.h
diff --git a/libopenjpeg/cio.c b/src/lib/openjp2/cio.c
index bd0ab15c..bd0ab15c 100644
--- a/libopenjpeg/cio.c
+++ b/src/lib/openjp2/cio.c
diff --git a/libopenjpeg/cio.h b/src/lib/openjp2/cio.h
index f5c4a862..f5c4a862 100644
--- a/libopenjpeg/cio.h
+++ b/src/lib/openjp2/cio.h
diff --git a/libopenjpeg/dwt.c b/src/lib/openjp2/dwt.c
index 94586eb5..94586eb5 100644
--- a/libopenjpeg/dwt.c
+++ b/src/lib/openjp2/dwt.c
diff --git a/libopenjpeg/dwt.h b/src/lib/openjp2/dwt.h
index 88308164..88308164 100644
--- a/libopenjpeg/dwt.h
+++ b/src/lib/openjp2/dwt.h
diff --git a/libopenjpeg/event.c b/src/lib/openjp2/event.c
index 23978b5b..23978b5b 100644
--- a/libopenjpeg/event.c
+++ b/src/lib/openjp2/event.c
diff --git a/libopenjpeg/event.h b/src/lib/openjp2/event.h
index 111cea9f..111cea9f 100644
--- a/libopenjpeg/event.h
+++ b/src/lib/openjp2/event.h
diff --git a/libopenjpeg/fix.h b/src/lib/openjp2/fix.h
index bcb2acb5..bcb2acb5 100644
--- a/libopenjpeg/fix.h
+++ b/src/lib/openjp2/fix.h
diff --git a/libopenjpeg/function_list.c b/src/lib/openjp2/function_list.c
index 1f84a429..1f84a429 100644
--- a/libopenjpeg/function_list.c
+++ b/src/lib/openjp2/function_list.c
diff --git a/libopenjpeg/function_list.h b/src/lib/openjp2/function_list.h
index 3707eec5..3707eec5 100644
--- a/libopenjpeg/function_list.h
+++ b/src/lib/openjp2/function_list.h
diff --git a/libopenjpeg/image.c b/src/lib/openjp2/image.c
index c9ae8216..c9ae8216 100644
--- a/libopenjpeg/image.c
+++ b/src/lib/openjp2/image.c
diff --git a/libopenjpeg/image.h b/src/lib/openjp2/image.h
index a6cd9f58..a6cd9f58 100644
--- a/libopenjpeg/image.h
+++ b/src/lib/openjp2/image.h
diff --git a/libopenjpeg/indexbox_manager.h b/src/lib/openjp2/indexbox_manager.h
index 7364df62..7364df62 100644
--- a/libopenjpeg/indexbox_manager.h
+++ b/src/lib/openjp2/indexbox_manager.h
diff --git a/libopenjpeg/int.h b/src/lib/openjp2/int.h
index 57fec99d..57fec99d 100644
--- a/libopenjpeg/int.h
+++ b/src/lib/openjp2/int.h
diff --git a/libopenjpeg/j2k.c b/src/lib/openjp2/j2k.c
index c76bcba5..c76bcba5 100644
--- a/libopenjpeg/j2k.c
+++ b/src/lib/openjp2/j2k.c
diff --git a/libopenjpeg/j2k.h b/src/lib/openjp2/j2k.h
index 2782a096..2782a096 100644
--- a/libopenjpeg/j2k.h
+++ b/src/lib/openjp2/j2k.h
diff --git a/libopenjpeg/j2k_lib.c b/src/lib/openjp2/j2k_lib.c
index a96df221..a96df221 100644
--- a/libopenjpeg/j2k_lib.c
+++ b/src/lib/openjp2/j2k_lib.c
diff --git a/libopenjpeg/j2k_lib.h b/src/lib/openjp2/j2k_lib.h
index 73a14c7d..73a14c7d 100644
--- a/libopenjpeg/j2k_lib.h
+++ b/src/lib/openjp2/j2k_lib.h
diff --git a/libopenjpeg/jp2.c b/src/lib/openjp2/jp2.c
index 95e6a751..95e6a751 100644
--- a/libopenjpeg/jp2.c
+++ b/src/lib/openjp2/jp2.c
diff --git a/libopenjpeg/jp2.h b/src/lib/openjp2/jp2.h
index f2f3c757..f2f3c757 100644
--- a/libopenjpeg/jp2.h
+++ b/src/lib/openjp2/jp2.h
diff --git a/libopenjpeg/jpt.c b/src/lib/openjp2/jpt.c
index a2566ea8..a2566ea8 100644
--- a/libopenjpeg/jpt.c
+++ b/src/lib/openjp2/jpt.c
diff --git a/libopenjpeg/jpt.h b/src/lib/openjp2/jpt.h
index eb01f98e..eb01f98e 100644
--- a/libopenjpeg/jpt.h
+++ b/src/lib/openjp2/jpt.h
diff --git a/libopenjpeg/mct.c b/src/lib/openjp2/mct.c
index fcc105e6..fcc105e6 100644
--- a/libopenjpeg/mct.c
+++ b/src/lib/openjp2/mct.c
diff --git a/libopenjpeg/mct.h b/src/lib/openjp2/mct.h
index 68107136..68107136 100644
--- a/libopenjpeg/mct.h
+++ b/src/lib/openjp2/mct.h
diff --git a/libopenjpeg/mqc.c b/src/lib/openjp2/mqc.c
index 8aeba10d..8aeba10d 100644
--- a/libopenjpeg/mqc.c
+++ b/src/lib/openjp2/mqc.c
diff --git a/libopenjpeg/mqc.h b/src/lib/openjp2/mqc.h
index 7984aaf8..7984aaf8 100644
--- a/libopenjpeg/mqc.h
+++ b/src/lib/openjp2/mqc.h
diff --git a/libopenjpeg/openjpeg.c b/src/lib/openjp2/openjpeg.c
index 8d879f21..8d879f21 100644
--- a/libopenjpeg/openjpeg.c
+++ b/src/lib/openjp2/openjpeg.c
diff --git a/libopenjpeg/openjpeg.h b/src/lib/openjp2/openjpeg.h
index de1576ff..de1576ff 100644
--- a/libopenjpeg/openjpeg.h
+++ b/src/lib/openjp2/openjpeg.h
diff --git a/libopenjpeg/opj_includes.h b/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
index d6a29263..d6a29263 100644
--- a/libopenjpeg/opj_inttypes.h
+++ b/src/lib/openjp2/opj_inttypes.h
diff --git a/libopenjpeg/opj_malloc.h b/src/lib/openjp2/opj_malloc.h
index 0b1d4fc1..0b1d4fc1 100644
--- a/libopenjpeg/opj_malloc.h
+++ b/src/lib/openjp2/opj_malloc.h
diff --git a/libopenjpeg/opj_stdint.h b/src/lib/openjp2/opj_stdint.h
index 3dd2ec2b..3dd2ec2b 100644
--- a/libopenjpeg/opj_stdint.h
+++ b/src/lib/openjp2/opj_stdint.h
diff --git a/libopenjpeg/phix_manager.c b/src/lib/openjp2/phix_manager.c
index 0e2e5704..0e2e5704 100644
--- a/libopenjpeg/phix_manager.c
+++ b/src/lib/openjp2/phix_manager.c
diff --git a/libopenjpeg/pi.c b/src/lib/openjp2/pi.c
index 8ebc510c..8ebc510c 100644
--- a/libopenjpeg/pi.c
+++ b/src/lib/openjp2/pi.c
diff --git a/libopenjpeg/pi.h b/src/lib/openjp2/pi.h
index 4d61e4b3..4d61e4b3 100644
--- a/libopenjpeg/pi.h
+++ b/src/lib/openjp2/pi.h
diff --git a/libopenjpeg/ppix_manager.c b/src/lib/openjp2/ppix_manager.c
index 5afbbfd7..5afbbfd7 100644
--- a/libopenjpeg/ppix_manager.c
+++ b/src/lib/openjp2/ppix_manager.c
diff --git a/libopenjpeg/raw.c b/src/lib/openjp2/raw.c
index 3d231bfd..3d231bfd 100644
--- a/libopenjpeg/raw.c
+++ b/src/lib/openjp2/raw.c
diff --git a/libopenjpeg/raw.h b/src/lib/openjp2/raw.h
index 3c4b372f..3c4b372f 100644
--- a/libopenjpeg/raw.h
+++ b/src/lib/openjp2/raw.h
diff --git a/libopenjpeg/t1.c b/src/lib/openjp2/t1.c
index 2418e586..2418e586 100644
--- a/libopenjpeg/t1.c
+++ b/src/lib/openjp2/t1.c
diff --git a/libopenjpeg/t1.h b/src/lib/openjp2/t1.h
index ab6c626d..ab6c626d 100644
--- a/libopenjpeg/t1.h
+++ b/src/lib/openjp2/t1.h
diff --git a/libopenjpeg/t1_generate_luts.c b/src/lib/openjp2/t1_generate_luts.c
index ffeff03e..ffeff03e 100644
--- a/libopenjpeg/t1_generate_luts.c
+++ b/src/lib/openjp2/t1_generate_luts.c
diff --git a/libopenjpeg/t1_luts.h b/src/lib/openjp2/t1_luts.h
index 1523b33a..1523b33a 100644
--- a/libopenjpeg/t1_luts.h
+++ b/src/lib/openjp2/t1_luts.h
diff --git a/libopenjpeg/t2.c b/src/lib/openjp2/t2.c
index 372b10ea..372b10ea 100644
--- a/libopenjpeg/t2.c
+++ b/src/lib/openjp2/t2.c
diff --git a/libopenjpeg/t2.h b/src/lib/openjp2/t2.h
index 2cefac9b..2cefac9b 100644
--- a/libopenjpeg/t2.h
+++ b/src/lib/openjp2/t2.h
diff --git a/libopenjpeg/tcd.c b/src/lib/openjp2/tcd.c
index d7725141..d7725141 100644
--- a/libopenjpeg/tcd.c
+++ b/src/lib/openjp2/tcd.c
diff --git a/libopenjpeg/tcd.h b/src/lib/openjp2/tcd.h
index b43d2850..b43d2850 100644
--- a/libopenjpeg/tcd.h
+++ b/src/lib/openjp2/tcd.h
diff --git a/libopenjpeg/tgt.c b/src/lib/openjp2/tgt.c
index 54bf536b..54bf536b 100644
--- a/libopenjpeg/tgt.c
+++ b/src/lib/openjp2/tgt.c
diff --git a/libopenjpeg/tgt.h b/src/lib/openjp2/tgt.h
index d3880f13..d3880f13 100644
--- a/libopenjpeg/tgt.h
+++ b/src/lib/openjp2/tgt.h
diff --git a/libopenjpeg/thix_manager.c b/src/lib/openjp2/thix_manager.c
index 38054886..38054886 100644
--- a/libopenjpeg/thix_manager.c
+++ b/src/lib/openjp2/thix_manager.c
diff --git a/libopenjpeg/tpix_manager.c b/src/lib/openjp2/tpix_manager.c
index 6cc49c73..6cc49c73 100644
--- a/libopenjpeg/tpix_manager.c
+++ b/src/lib/openjp2/tpix_manager.c
diff --git a/applications/jpip/libopenjpip/CMakeLists.txt b/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
index 6def5d6f..6def5d6f 100644
--- a/applications/jpip/libopenjpip/Makefile.am
+++ b/src/lib/openjpip/Makefile.am
diff --git a/applications/jpip/libopenjpip/auxtrans_manager.c b/src/lib/openjpip/auxtrans_manager.c
index 91c06ac4..91c06ac4 100644
--- a/applications/jpip/libopenjpip/auxtrans_manager.c
+++ b/src/lib/openjpip/auxtrans_manager.c
diff --git a/applications/jpip/libopenjpip/auxtrans_manager.h b/src/lib/openjpip/auxtrans_manager.h
index c80988a9..c80988a9 100644
--- a/applications/jpip/libopenjpip/auxtrans_manager.h
+++ b/src/lib/openjpip/auxtrans_manager.h
diff --git a/applications/jpip/libopenjpip/bool.h b/src/lib/openjpip/bool.h
index c3adf580..c3adf580 100644
--- a/applications/jpip/libopenjpip/bool.h
+++ b/src/lib/openjpip/bool.h
diff --git a/applications/jpip/libopenjpip/box_manager.c b/src/lib/openjpip/box_manager.c
index 87bb7756..87bb7756 100644
--- a/applications/jpip/libopenjpip/box_manager.c
+++ b/src/lib/openjpip/box_manager.c
diff --git a/applications/jpip/libopenjpip/box_manager.h b/src/lib/openjpip/box_manager.h
index 88cd5336..88cd5336 100644
--- a/applications/jpip/libopenjpip/box_manager.h
+++ b/src/lib/openjpip/box_manager.h
diff --git a/applications/jpip/libopenjpip/boxheader_manager.c b/src/lib/openjpip/boxheader_manager.c
index b345a96d..b345a96d 100644
--- a/applications/jpip/libopenjpip/boxheader_manager.c
+++ b/src/lib/openjpip/boxheader_manager.c
diff --git a/applications/jpip/libopenjpip/boxheader_manager.h b/src/lib/openjpip/boxheader_manager.h
index f8e48f39..f8e48f39 100644
--- a/applications/jpip/libopenjpip/boxheader_manager.h
+++ b/src/lib/openjpip/boxheader_manager.h
diff --git a/applications/jpip/libopenjpip/byte_manager.c b/src/lib/openjpip/byte_manager.c
index 502c26bd..502c26bd 100644
--- a/applications/jpip/libopenjpip/byte_manager.c
+++ b/src/lib/openjpip/byte_manager.c
diff --git a/applications/jpip/libopenjpip/byte_manager.h b/src/lib/openjpip/byte_manager.h
index 0a29503e..0a29503e 100644
--- a/applications/jpip/libopenjpip/byte_manager.h
+++ b/src/lib/openjpip/byte_manager.h
diff --git a/applications/jpip/libopenjpip/cache_manager.c b/src/lib/openjpip/cache_manager.c
index 76f7b7b3..76f7b7b3 100644
--- a/applications/jpip/libopenjpip/cache_manager.c
+++ b/src/lib/openjpip/cache_manager.c
diff --git a/applications/jpip/libopenjpip/cache_manager.h b/src/lib/openjpip/cache_manager.h
index 0c9afb0b..0c9afb0b 100644
--- a/applications/jpip/libopenjpip/cache_manager.h
+++ b/src/lib/openjpip/cache_manager.h
diff --git a/applications/jpip/libopenjpip/cachemodel_manager.c b/src/lib/openjpip/cachemodel_manager.c
index 1a84a6b8..1a84a6b8 100644
--- a/applications/jpip/libopenjpip/cachemodel_manager.c
+++ b/src/lib/openjpip/cachemodel_manager.c
diff --git a/applications/jpip/libopenjpip/cachemodel_manager.h b/src/lib/openjpip/cachemodel_manager.h
index 2c9dc540..2c9dc540 100644
--- a/applications/jpip/libopenjpip/cachemodel_manager.h
+++ b/src/lib/openjpip/cachemodel_manager.h
diff --git a/applications/jpip/libopenjpip/channel_manager.c b/src/lib/openjpip/channel_manager.c
index 313f8ced..313f8ced 100644
--- a/applications/jpip/libopenjpip/channel_manager.c
+++ b/src/lib/openjpip/channel_manager.c
diff --git a/applications/jpip/libopenjpip/channel_manager.h b/src/lib/openjpip/channel_manager.h
index 79cc0160..79cc0160 100644
--- a/applications/jpip/libopenjpip/channel_manager.h
+++ b/src/lib/openjpip/channel_manager.h
diff --git a/applications/jpip/libopenjpip/codestream_manager.c b/src/lib/openjpip/codestream_manager.c
index d7797c13..d7797c13 100644
--- a/applications/jpip/libopenjpip/codestream_manager.c
+++ b/src/lib/openjpip/codestream_manager.c
diff --git a/applications/jpip/libopenjpip/codestream_manager.h b/src/lib/openjpip/codestream_manager.h
index b600d8e5..b600d8e5 100644
--- a/applications/jpip/libopenjpip/codestream_manager.h
+++ b/src/lib/openjpip/codestream_manager.h
diff --git a/applications/jpip/libopenjpip/dec_clientmsg_handler.c b/src/lib/openjpip/dec_clientmsg_handler.c
index 20bd4f2b..20bd4f2b 100644
--- a/applications/jpip/libopenjpip/dec_clientmsg_handler.c
+++ b/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
index 7929207a..7929207a 100644
--- a/applications/jpip/libopenjpip/dec_clientmsg_handler.h
+++ b/src/lib/openjpip/dec_clientmsg_handler.h
diff --git a/applications/jpip/libopenjpip/faixbox_manager.c b/src/lib/openjpip/faixbox_manager.c
index 3c443832..3c443832 100644
--- a/applications/jpip/libopenjpip/faixbox_manager.c
+++ b/src/lib/openjpip/faixbox_manager.c
diff --git a/applications/jpip/libopenjpip/faixbox_manager.h b/src/lib/openjpip/faixbox_manager.h
index 45ea8c3e..45ea8c3e 100644
--- a/applications/jpip/libopenjpip/faixbox_manager.h
+++ b/src/lib/openjpip/faixbox_manager.h
diff --git a/applications/jpip/libopenjpip/ihdrbox_manager.c b/src/lib/openjpip/ihdrbox_manager.c
index d501b612..d501b612 100644
--- a/applications/jpip/libopenjpip/ihdrbox_manager.c
+++ b/src/lib/openjpip/ihdrbox_manager.c
diff --git a/applications/jpip/libopenjpip/ihdrbox_manager.h b/src/lib/openjpip/ihdrbox_manager.h
index 9fa9a830..9fa9a830 100644
--- a/applications/jpip/libopenjpip/ihdrbox_manager.h
+++ b/src/lib/openjpip/ihdrbox_manager.h
diff --git a/applications/jpip/libopenjpip/imgreg_manager.c b/src/lib/openjpip/imgreg_manager.c
index 3a713c32..3a713c32 100644
--- a/applications/jpip/libopenjpip/imgreg_manager.c
+++ b/src/lib/openjpip/imgreg_manager.c
diff --git a/applications/jpip/libopenjpip/imgreg_manager.h b/src/lib/openjpip/imgreg_manager.h
index 7967120b..7967120b 100644
--- a/applications/jpip/libopenjpip/imgreg_manager.h
+++ b/src/lib/openjpip/imgreg_manager.h
diff --git a/applications/jpip/libopenjpip/imgsock_manager.c b/src/lib/openjpip/imgsock_manager.c
index 612cb378..612cb378 100644
--- a/applications/jpip/libopenjpip/imgsock_manager.c
+++ b/src/lib/openjpip/imgsock_manager.c
diff --git a/applications/jpip/libopenjpip/imgsock_manager.h b/src/lib/openjpip/imgsock_manager.h
index 044bdc53..044bdc53 100644
--- a/applications/jpip/libopenjpip/imgsock_manager.h
+++ b/src/lib/openjpip/imgsock_manager.h
diff --git a/applications/jpip/libopenjpip/index_manager.c b/src/lib/openjpip/index_manager.c
index 6f8357e9..6f8357e9 100644
--- a/applications/jpip/libopenjpip/index_manager.c
+++ b/src/lib/openjpip/index_manager.c
diff --git a/applications/jpip/libopenjpip/index_manager.h b/src/lib/openjpip/index_manager.h
index c1969fac..c1969fac 100644
--- a/applications/jpip/libopenjpip/index_manager.h
+++ b/src/lib/openjpip/index_manager.h
diff --git a/applications/jpip/libopenjpip/j2kheader_manager.c b/src/lib/openjpip/j2kheader_manager.c
index 5a6054cc..5a6054cc 100644
--- a/applications/jpip/libopenjpip/j2kheader_manager.c
+++ b/src/lib/openjpip/j2kheader_manager.c
diff --git a/applications/jpip/libopenjpip/j2kheader_manager.h b/src/lib/openjpip/j2kheader_manager.h
index a6146c64..a6146c64 100644
--- a/applications/jpip/libopenjpip/j2kheader_manager.h
+++ b/src/lib/openjpip/j2kheader_manager.h
diff --git a/applications/jpip/libopenjpip/jp2k_decoder.c b/src/lib/openjpip/jp2k_decoder.c
index 9d619b09..9d619b09 100644
--- a/applications/jpip/libopenjpip/jp2k_decoder.c
+++ b/src/lib/openjpip/jp2k_decoder.c
diff --git a/applications/jpip/libopenjpip/jp2k_decoder.h b/src/lib/openjpip/jp2k_decoder.h
index c999cdf1..c999cdf1 100644
--- a/applications/jpip/libopenjpip/jp2k_decoder.h
+++ b/src/lib/openjpip/jp2k_decoder.h
diff --git a/applications/jpip/libopenjpip/jp2k_encoder.c b/src/lib/openjpip/jp2k_encoder.c
index 23c8b2fe..23c8b2fe 100644
--- a/applications/jpip/libopenjpip/jp2k_encoder.c
+++ b/src/lib/openjpip/jp2k_encoder.c
diff --git a/applications/jpip/libopenjpip/jp2k_encoder.h b/src/lib/openjpip/jp2k_encoder.h
index 3945e2a0..3945e2a0 100644
--- a/applications/jpip/libopenjpip/jp2k_encoder.h
+++ b/src/lib/openjpip/jp2k_encoder.h
diff --git a/applications/jpip/libopenjpip/jpip_parser.c b/src/lib/openjpip/jpip_parser.c
index 663214e4..663214e4 100644
--- a/applications/jpip/libopenjpip/jpip_parser.c
+++ b/src/lib/openjpip/jpip_parser.c
diff --git a/applications/jpip/libopenjpip/jpip_parser.h b/src/lib/openjpip/jpip_parser.h
index 8070c8a9..8070c8a9 100644
--- a/applications/jpip/libopenjpip/jpip_parser.h
+++ b/src/lib/openjpip/jpip_parser.h
diff --git a/applications/jpip/libopenjpip/jpipstream_manager.c b/src/lib/openjpip/jpipstream_manager.c
index 8cb2a77f..8cb2a77f 100644
--- a/applications/jpip/libopenjpip/jpipstream_manager.c
+++ b/src/lib/openjpip/jpipstream_manager.c
diff --git a/applications/jpip/libopenjpip/jpipstream_manager.h b/src/lib/openjpip/jpipstream_manager.h
index 5328be62..5328be62 100644
--- a/applications/jpip/libopenjpip/jpipstream_manager.h
+++ b/src/lib/openjpip/jpipstream_manager.h
diff --git a/applications/jpip/libopenjpip/manfbox_manager.c b/src/lib/openjpip/manfbox_manager.c
index 37472461..37472461 100644
--- a/applications/jpip/libopenjpip/manfbox_manager.c
+++ b/src/lib/openjpip/manfbox_manager.c
diff --git a/applications/jpip/libopenjpip/manfbox_manager.h b/src/lib/openjpip/manfbox_manager.h
index ed4189e0..ed4189e0 100644
--- a/applications/jpip/libopenjpip/manfbox_manager.h
+++ b/src/lib/openjpip/manfbox_manager.h
diff --git a/applications/jpip/libopenjpip/marker_manager.c b/src/lib/openjpip/marker_manager.c
index 766ecd6e..766ecd6e 100644
--- a/applications/jpip/libopenjpip/marker_manager.c
+++ b/src/lib/openjpip/marker_manager.c
diff --git a/applications/jpip/libopenjpip/marker_manager.h b/src/lib/openjpip/marker_manager.h
index 68ea2a8b..68ea2a8b 100644
--- a/applications/jpip/libopenjpip/marker_manager.h
+++ b/src/lib/openjpip/marker_manager.h
diff --git a/applications/jpip/libopenjpip/metadata_manager.c b/src/lib/openjpip/metadata_manager.c
index 12b61efc..12b61efc 100644
--- a/applications/jpip/libopenjpip/metadata_manager.c
+++ b/src/lib/openjpip/metadata_manager.c
diff --git a/applications/jpip/libopenjpip/metadata_manager.h b/src/lib/openjpip/metadata_manager.h
index 089b19a5..089b19a5 100644
--- a/applications/jpip/libopenjpip/metadata_manager.h
+++ b/src/lib/openjpip/metadata_manager.h
diff --git a/applications/jpip/libopenjpip/mhixbox_manager.c b/src/lib/openjpip/mhixbox_manager.c
index b311126b..b311126b 100644
--- a/applications/jpip/libopenjpip/mhixbox_manager.c
+++ b/src/lib/openjpip/mhixbox_manager.c
diff --git a/applications/jpip/libopenjpip/mhixbox_manager.h b/src/lib/openjpip/mhixbox_manager.h
index 5905b25f..5905b25f 100644
--- a/applications/jpip/libopenjpip/mhixbox_manager.h
+++ b/src/lib/openjpip/mhixbox_manager.h
diff --git a/applications/jpip/libopenjpip/msgqueue_manager.c b/src/lib/openjpip/msgqueue_manager.c
index 29b64a26..29b64a26 100644
--- a/applications/jpip/libopenjpip/msgqueue_manager.c
+++ b/src/lib/openjpip/msgqueue_manager.c
diff --git a/applications/jpip/libopenjpip/msgqueue_manager.h b/src/lib/openjpip/msgqueue_manager.h
index e54f2dc1..e54f2dc1 100644
--- a/applications/jpip/libopenjpip/msgqueue_manager.h
+++ b/src/lib/openjpip/msgqueue_manager.h
diff --git a/applications/jpip/libopenjpip/openjpip.c b/src/lib/openjpip/openjpip.c
index de6293d4..de6293d4 100644
--- a/applications/jpip/libopenjpip/openjpip.c
+++ b/src/lib/openjpip/openjpip.c
diff --git a/applications/jpip/libopenjpip/openjpip.h b/src/lib/openjpip/openjpip.h
index c08c3d86..c08c3d86 100644
--- a/applications/jpip/libopenjpip/openjpip.h
+++ b/src/lib/openjpip/openjpip.h
diff --git a/applications/jpip/libopenjpip/placeholder_manager.c b/src/lib/openjpip/placeholder_manager.c
index 4a37a13b..4a37a13b 100644
--- a/applications/jpip/libopenjpip/placeholder_manager.c
+++ b/src/lib/openjpip/placeholder_manager.c
diff --git a/applications/jpip/libopenjpip/placeholder_manager.h b/src/lib/openjpip/placeholder_manager.h
index ced20854..ced20854 100644
--- a/applications/jpip/libopenjpip/placeholder_manager.h
+++ b/src/lib/openjpip/placeholder_manager.h
diff --git a/applications/jpip/libopenjpip/query_parser.c b/src/lib/openjpip/query_parser.c
index 460a5eb6..460a5eb6 100644
--- a/applications/jpip/libopenjpip/query_parser.c
+++ b/src/lib/openjpip/query_parser.c
diff --git a/applications/jpip/libopenjpip/query_parser.h b/src/lib/openjpip/query_parser.h
index d60cafe6..d60cafe6 100644
--- a/applications/jpip/libopenjpip/query_parser.h
+++ b/src/lib/openjpip/query_parser.h
diff --git a/applications/jpip/libopenjpip/session_manager.c b/src/lib/openjpip/session_manager.c
index 5c1d7588..5c1d7588 100644
--- a/applications/jpip/libopenjpip/session_manager.c
+++ b/src/lib/openjpip/session_manager.c
diff --git a/applications/jpip/libopenjpip/session_manager.h b/src/lib/openjpip/session_manager.h
index 03df4f4b..03df4f4b 100644
--- a/applications/jpip/libopenjpip/session_manager.h
+++ b/src/lib/openjpip/session_manager.h
diff --git a/applications/jpip/libopenjpip/sock_manager.c b/src/lib/openjpip/sock_manager.c
index 432b03fa..432b03fa 100644
--- a/applications/jpip/libopenjpip/sock_manager.c
+++ b/src/lib/openjpip/sock_manager.c
diff --git a/applications/jpip/libopenjpip/sock_manager.h b/src/lib/openjpip/sock_manager.h
index ee67131e..ee67131e 100644
--- a/applications/jpip/libopenjpip/sock_manager.h
+++ b/src/lib/openjpip/sock_manager.h
diff --git a/applications/jpip/libopenjpip/target_manager.c b/src/lib/openjpip/target_manager.c
index 8b4763a5..8b4763a5 100644
--- a/applications/jpip/libopenjpip/target_manager.c
+++ b/src/lib/openjpip/target_manager.c
diff --git a/applications/jpip/libopenjpip/target_manager.h b/src/lib/openjpip/target_manager.h
index 275adc4a..275adc4a 100644
--- a/applications/jpip/libopenjpip/target_manager.h
+++ b/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
index 26ab4eba..26ab4eba 100644
--- a/libopenjpeg/jpwl/Makefile.am
+++ b/src/lib/openjpwl/Makefile.am
diff --git a/libopenjpeg/jpwl/README.txt b/src/lib/openjpwl/README.txt
index e289e9e4..e289e9e4 100644
--- a/libopenjpeg/jpwl/README.txt
+++ b/src/lib/openjpwl/README.txt
diff --git a/libopenjpeg/jpwl/crc.c b/src/lib/openjpwl/crc.c
index 6a4a7d8f..6a4a7d8f 100644
--- a/libopenjpeg/jpwl/crc.c
+++ b/src/lib/openjpwl/crc.c
diff --git a/libopenjpeg/jpwl/crc.h b/src/lib/openjpwl/crc.h
index 4ea2c4ce..4ea2c4ce 100644
--- a/libopenjpeg/jpwl/crc.h
+++ b/src/lib/openjpwl/crc.h
diff --git a/libopenjpeg/jpwl/jpwl.c b/src/lib/openjpwl/jpwl.c
index ba8cac5a..ba8cac5a 100644
--- a/libopenjpeg/jpwl/jpwl.c
+++ b/src/lib/openjpwl/jpwl.c
diff --git a/libopenjpeg/jpwl/jpwl.h b/src/lib/openjpwl/jpwl.h
index 52c1fbc2..52c1fbc2 100644
--- a/libopenjpeg/jpwl/jpwl.h
+++ b/src/lib/openjpwl/jpwl.h
diff --git a/libopenjpeg/jpwl/jpwl_lib.c b/src/lib/openjpwl/jpwl_lib.c
index b75cfdb1..b75cfdb1 100644
--- a/libopenjpeg/jpwl/jpwl_lib.c
+++ b/src/lib/openjpwl/jpwl_lib.c
diff --git a/libopenjpeg/jpwl/rs.c b/src/lib/openjpwl/rs.c
index 0841c637..0841c637 100644
--- a/libopenjpeg/jpwl/rs.c
+++ b/src/lib/openjpwl/rs.c
diff --git a/libopenjpeg/jpwl/rs.h b/src/lib/openjpwl/rs.h
index 7d02a477..7d02a477 100644
--- a/libopenjpeg/jpwl/rs.h
+++ b/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
index 1b1c9ba1..1b1c9ba1 100644
--- a/applications/JavaOpenJPEG/CMakeLists.txt
+++ b/wrapping/java/openjp2/CMakeLists.txt
diff --git a/applications/JavaOpenJPEG/JavaOpenJPEG.c b/wrapping/java/openjp2/JavaOpenJPEG.c
index 3f8e2ee7..3f8e2ee7 100644
--- a/applications/JavaOpenJPEG/JavaOpenJPEG.c
+++ b/wrapping/java/openjp2/JavaOpenJPEG.c
diff --git a/applications/JavaOpenJPEG/JavaOpenJPEGDecoder.c b/wrapping/java/openjp2/JavaOpenJPEGDecoder.c
index a273028c..a273028c 100644
--- a/applications/JavaOpenJPEG/JavaOpenJPEGDecoder.c
+++ b/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
index 0bacc84f..0bacc84f 100644
--- a/applications/JavaOpenJPEG/java-sources/org/openJpeg/OpenJPEGJavaDecoder.java
+++ b/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
index 2c638cfa..2c638cfa 100644
--- a/applications/JavaOpenJPEG/java-sources/org/openJpeg/OpenJPEGJavaEncoder.java
+++ b/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
index 0e8de2e7..0e8de2e7 100644
--- a/applications/JavaOpenJPEG/org_openJpeg_OpenJPEGJavaDecoder.h
+++ b/wrapping/java/openjp2/org_openJpeg_OpenJPEGJavaDecoder.h
diff --git a/applications/JavaOpenJPEG/org_openJpeg_OpenJPEGJavaEncoder.h b/wrapping/java/openjp2/org_openJpeg_OpenJPEGJavaEncoder.h
index 22b3d958..22b3d958 100644
--- a/applications/JavaOpenJPEG/org_openJpeg_OpenJPEGJavaEncoder.h
+++ b/wrapping/java/openjp2/org_openJpeg_OpenJPEGJavaEncoder.h