diff --git a/JavaOpenJPEG/CMakeLists.txt b/applications/JavaOpenJPEG/CMakeLists.txt
similarity index 100%
rename from JavaOpenJPEG/CMakeLists.txt
rename to applications/JavaOpenJPEG/CMakeLists.txt
diff --git a/JavaOpenJPEG/JavaOpenJPEG.c b/applications/JavaOpenJPEG/JavaOpenJPEG.c
similarity index 100%
rename from JavaOpenJPEG/JavaOpenJPEG.c
rename to applications/JavaOpenJPEG/JavaOpenJPEG.c
diff --git a/JavaOpenJPEG/JavaOpenJPEGDecoder.c b/applications/JavaOpenJPEG/JavaOpenJPEGDecoder.c
similarity index 100%
rename from JavaOpenJPEG/JavaOpenJPEGDecoder.c
rename to applications/JavaOpenJPEG/JavaOpenJPEGDecoder.c
diff --git a/JavaOpenJPEG/Makefile b/applications/JavaOpenJPEG/Makefile
similarity index 100%
rename from JavaOpenJPEG/Makefile
rename to applications/JavaOpenJPEG/Makefile
diff --git a/JavaOpenJPEG/java-jni/include/jawt.h b/applications/JavaOpenJPEG/java-jni/include/jawt.h
similarity index 100%
rename from JavaOpenJPEG/java-jni/include/jawt.h
rename to applications/JavaOpenJPEG/java-jni/include/jawt.h
diff --git a/JavaOpenJPEG/java-jni/include/jdwpTransport.h b/applications/JavaOpenJPEG/java-jni/include/jdwpTransport.h
similarity index 100%
rename from JavaOpenJPEG/java-jni/include/jdwpTransport.h
rename to applications/JavaOpenJPEG/java-jni/include/jdwpTransport.h
diff --git a/JavaOpenJPEG/java-jni/include/jni.h b/applications/JavaOpenJPEG/java-jni/include/jni.h
similarity index 100%
rename from JavaOpenJPEG/java-jni/include/jni.h
rename to applications/JavaOpenJPEG/java-jni/include/jni.h
diff --git a/JavaOpenJPEG/java-jni/include/jvmdi.h b/applications/JavaOpenJPEG/java-jni/include/jvmdi.h
similarity index 100%
rename from JavaOpenJPEG/java-jni/include/jvmdi.h
rename to applications/JavaOpenJPEG/java-jni/include/jvmdi.h
diff --git a/JavaOpenJPEG/java-jni/include/jvmpi.h b/applications/JavaOpenJPEG/java-jni/include/jvmpi.h
similarity index 100%
rename from JavaOpenJPEG/java-jni/include/jvmpi.h
rename to applications/JavaOpenJPEG/java-jni/include/jvmpi.h
diff --git a/JavaOpenJPEG/java-jni/include/jvmti.h b/applications/JavaOpenJPEG/java-jni/include/jvmti.h
similarity index 100%
rename from JavaOpenJPEG/java-jni/include/jvmti.h
rename to applications/JavaOpenJPEG/java-jni/include/jvmti.h
diff --git a/JavaOpenJPEG/java-jni/include/win32/jawt_md.h b/applications/JavaOpenJPEG/java-jni/include/win32/jawt_md.h
similarity index 100%
rename from JavaOpenJPEG/java-jni/include/win32/jawt_md.h
rename to applications/JavaOpenJPEG/java-jni/include/win32/jawt_md.h
diff --git a/JavaOpenJPEG/java-jni/include/win32/jni_md.h b/applications/JavaOpenJPEG/java-jni/include/win32/jni_md.h
similarity index 100%
rename from JavaOpenJPEG/java-jni/include/win32/jni_md.h
rename to applications/JavaOpenJPEG/java-jni/include/win32/jni_md.h
diff --git a/JavaOpenJPEG/java-jni/lib/jvm.lib b/applications/JavaOpenJPEG/java-jni/lib/jvm.lib
similarity index 100%
rename from JavaOpenJPEG/java-jni/lib/jvm.lib
rename to applications/JavaOpenJPEG/java-jni/lib/jvm.lib
diff --git a/JavaOpenJPEG/java-sources/org/openJpeg/OpenJPEGJavaDecoder.java b/applications/JavaOpenJPEG/java-sources/org/openJpeg/OpenJPEGJavaDecoder.java
similarity index 100%
rename from JavaOpenJPEG/java-sources/org/openJpeg/OpenJPEGJavaDecoder.java
rename to applications/JavaOpenJPEG/java-sources/org/openJpeg/OpenJPEGJavaDecoder.java
diff --git a/JavaOpenJPEG/java-sources/org/openJpeg/OpenJPEGJavaEncoder.java b/applications/JavaOpenJPEG/java-sources/org/openJpeg/OpenJPEGJavaEncoder.java
similarity index 100%
rename from JavaOpenJPEG/java-sources/org/openJpeg/OpenJPEGJavaEncoder.java
rename to applications/JavaOpenJPEG/java-sources/org/openJpeg/OpenJPEGJavaEncoder.java
diff --git a/JavaOpenJPEG/org_openJpeg_OpenJPEGJavaDecoder.h b/applications/JavaOpenJPEG/org_openJpeg_OpenJPEGJavaDecoder.h
similarity index 100%
rename from JavaOpenJPEG/org_openJpeg_OpenJPEGJavaDecoder.h
rename to applications/JavaOpenJPEG/org_openJpeg_OpenJPEGJavaDecoder.h
diff --git a/JavaOpenJPEG/org_openJpeg_OpenJPEGJavaEncoder.h b/applications/JavaOpenJPEG/org_openJpeg_OpenJPEGJavaEncoder.h
similarity index 100%
rename from JavaOpenJPEG/org_openJpeg_OpenJPEGJavaEncoder.h
rename to applications/JavaOpenJPEG/org_openJpeg_OpenJPEGJavaEncoder.h
diff --git a/OPJViewer/Makefile b/applications/OPJViewer/Makefile
similarity index 100%
rename from OPJViewer/Makefile
rename to applications/OPJViewer/Makefile
diff --git a/OPJViewer/OPJViewer.dsp b/applications/OPJViewer/OPJViewer.dsp
similarity index 100%
rename from OPJViewer/OPJViewer.dsp
rename to applications/OPJViewer/OPJViewer.dsp
diff --git a/OPJViewer/OPJViewer.dsw b/applications/OPJViewer/OPJViewer.dsw
similarity index 100%
rename from OPJViewer/OPJViewer.dsw
rename to applications/OPJViewer/OPJViewer.dsw
diff --git a/OPJViewer/OPJViewer.iss b/applications/OPJViewer/OPJViewer.iss
similarity index 100%
rename from OPJViewer/OPJViewer.iss
rename to applications/OPJViewer/OPJViewer.iss
diff --git a/OPJViewer/Readme.txt b/applications/OPJViewer/Readme.txt
similarity index 100%
rename from OPJViewer/Readme.txt
rename to applications/OPJViewer/Readme.txt
diff --git a/OPJViewer/about/about.htm b/applications/OPJViewer/about/about.htm
similarity index 100%
rename from OPJViewer/about/about.htm
rename to applications/OPJViewer/about/about.htm
diff --git a/OPJViewer/about/opj_logo.png b/applications/OPJViewer/about/opj_logo.png
similarity index 100%
rename from OPJViewer/about/opj_logo.png
rename to applications/OPJViewer/about/opj_logo.png
diff --git a/OPJViewer/buildupdate.bat b/applications/OPJViewer/buildupdate.bat
similarity index 100%
rename from OPJViewer/buildupdate.bat
rename to applications/OPJViewer/buildupdate.bat
diff --git a/OPJViewer/source/OPJAbout.cpp b/applications/OPJViewer/source/OPJAbout.cpp
similarity index 100%
rename from OPJViewer/source/OPJAbout.cpp
rename to applications/OPJViewer/source/OPJAbout.cpp
diff --git a/OPJViewer/source/OPJChild.ico b/applications/OPJViewer/source/OPJChild.ico
similarity index 100%
rename from OPJViewer/source/OPJChild.ico
rename to applications/OPJViewer/source/OPJChild.ico
diff --git a/OPJViewer/source/OPJChild16.xpm b/applications/OPJViewer/source/OPJChild16.xpm
similarity index 100%
rename from OPJViewer/source/OPJChild16.xpm
rename to applications/OPJViewer/source/OPJChild16.xpm
diff --git a/OPJViewer/source/OPJDialogs.cpp b/applications/OPJViewer/source/OPJDialogs.cpp
similarity index 100%
rename from OPJViewer/source/OPJDialogs.cpp
rename to applications/OPJViewer/source/OPJDialogs.cpp
diff --git a/OPJViewer/source/OPJThreads.cpp b/applications/OPJViewer/source/OPJThreads.cpp
similarity index 100%
rename from OPJViewer/source/OPJThreads.cpp
rename to applications/OPJViewer/source/OPJThreads.cpp
diff --git a/OPJViewer/source/OPJViewer.cpp b/applications/OPJViewer/source/OPJViewer.cpp
similarity index 100%
rename from OPJViewer/source/OPJViewer.cpp
rename to applications/OPJViewer/source/OPJViewer.cpp
diff --git a/OPJViewer/source/OPJViewer.h b/applications/OPJViewer/source/OPJViewer.h
similarity index 100%
rename from OPJViewer/source/OPJViewer.h
rename to applications/OPJViewer/source/OPJViewer.h
diff --git a/OPJViewer/source/OPJViewer.ico b/applications/OPJViewer/source/OPJViewer.ico
similarity index 100%
rename from OPJViewer/source/OPJViewer.ico
rename to applications/OPJViewer/source/OPJViewer.ico
diff --git a/OPJViewer/source/OPJViewer.rc b/applications/OPJViewer/source/OPJViewer.rc
similarity index 100%
rename from OPJViewer/source/OPJViewer.rc
rename to applications/OPJViewer/source/OPJViewer.rc
diff --git a/OPJViewer/source/OPJViewer16.xpm b/applications/OPJViewer/source/OPJViewer16.xpm
similarity index 100%
rename from OPJViewer/source/OPJViewer16.xpm
rename to applications/OPJViewer/source/OPJViewer16.xpm
diff --git a/OPJViewer/source/about_htm.h b/applications/OPJViewer/source/about_htm.h
similarity index 100%
rename from OPJViewer/source/about_htm.h
rename to applications/OPJViewer/source/about_htm.h
diff --git a/OPJViewer/source/build.h b/applications/OPJViewer/source/build.h
similarity index 100%
rename from OPJViewer/source/build.h
rename to applications/OPJViewer/source/build.h
diff --git a/OPJViewer/source/icon1.xpm b/applications/OPJViewer/source/icon1.xpm
similarity index 100%
rename from OPJViewer/source/icon1.xpm
rename to applications/OPJViewer/source/icon1.xpm
diff --git a/OPJViewer/source/icon2.xpm b/applications/OPJViewer/source/icon2.xpm
similarity index 100%
rename from OPJViewer/source/icon2.xpm
rename to applications/OPJViewer/source/icon2.xpm
diff --git a/OPJViewer/source/icon3.xpm b/applications/OPJViewer/source/icon3.xpm
similarity index 100%
rename from OPJViewer/source/icon3.xpm
rename to applications/OPJViewer/source/icon3.xpm
diff --git a/OPJViewer/source/icon4.xpm b/applications/OPJViewer/source/icon4.xpm
similarity index 100%
rename from OPJViewer/source/icon4.xpm
rename to applications/OPJViewer/source/icon4.xpm
diff --git a/OPJViewer/source/icon5.xpm b/applications/OPJViewer/source/icon5.xpm
similarity index 100%
rename from OPJViewer/source/icon5.xpm
rename to applications/OPJViewer/source/icon5.xpm
diff --git a/OPJViewer/source/imagjpeg2000.cpp b/applications/OPJViewer/source/imagjpeg2000.cpp
similarity index 100%
rename from OPJViewer/source/imagjpeg2000.cpp
rename to applications/OPJViewer/source/imagjpeg2000.cpp
diff --git a/OPJViewer/source/imagjpeg2000.h b/applications/OPJViewer/source/imagjpeg2000.h
similarity index 100%
rename from OPJViewer/source/imagjpeg2000.h
rename to applications/OPJViewer/source/imagjpeg2000.h
diff --git a/OPJViewer/source/imagmxf.cpp b/applications/OPJViewer/source/imagmxf.cpp
similarity index 100%
rename from OPJViewer/source/imagmxf.cpp
rename to applications/OPJViewer/source/imagmxf.cpp
diff --git a/OPJViewer/source/imagmxf.h b/applications/OPJViewer/source/imagmxf.h
similarity index 100%
rename from OPJViewer/source/imagmxf.h
rename to applications/OPJViewer/source/imagmxf.h
diff --git a/OPJViewer/source/license.txt b/applications/OPJViewer/source/license.txt
similarity index 100%
rename from OPJViewer/source/license.txt
rename to applications/OPJViewer/source/license.txt
diff --git a/OPJViewer/source/opj_logo.xpm b/applications/OPJViewer/source/opj_logo.xpm
similarity index 100%
rename from OPJViewer/source/opj_logo.xpm
rename to applications/OPJViewer/source/opj_logo.xpm
diff --git a/OPJViewer/source/readmeafter.txt b/applications/OPJViewer/source/readmeafter.txt
similarity index 100%
rename from OPJViewer/source/readmeafter.txt
rename to applications/OPJViewer/source/readmeafter.txt
diff --git a/OPJViewer/source/readmebefore.txt b/applications/OPJViewer/source/readmebefore.txt
similarity index 100%
rename from OPJViewer/source/readmebefore.txt
rename to applications/OPJViewer/source/readmebefore.txt
diff --git a/OPJViewer/source/wxj2kparser.cpp b/applications/OPJViewer/source/wxj2kparser.cpp
similarity index 100%
rename from OPJViewer/source/wxj2kparser.cpp
rename to applications/OPJViewer/source/wxj2kparser.cpp
diff --git a/OPJViewer/source/wxjp2parser.cpp b/applications/OPJViewer/source/wxjp2parser.cpp
similarity index 100%
rename from OPJViewer/source/wxjp2parser.cpp
rename to applications/OPJViewer/source/wxjp2parser.cpp
diff --git a/codec/CMakeLists.txt b/applications/codec/CMakeLists.txt
similarity index 100%
rename from codec/CMakeLists.txt
rename to applications/codec/CMakeLists.txt
diff --git a/codec/Makefile.am b/applications/codec/Makefile.am
similarity index 100%
rename from codec/Makefile.am
rename to applications/codec/Makefile.am
diff --git a/codec/Makefile.nix b/applications/codec/Makefile.nix
similarity index 100%
rename from codec/Makefile.nix
rename to applications/codec/Makefile.nix
diff --git a/codec/README b/applications/codec/README
similarity index 100%
rename from codec/README
rename to applications/codec/README
diff --git a/codec/convert.c b/applications/codec/convert.c
similarity index 100%
rename from codec/convert.c
rename to applications/codec/convert.c
diff --git a/codec/convert.h b/applications/codec/convert.h
similarity index 100%
rename from codec/convert.h
rename to applications/codec/convert.h
diff --git a/codec/image_to_j2k.c b/applications/codec/image_to_j2k.c
similarity index 100%
rename from codec/image_to_j2k.c
rename to applications/codec/image_to_j2k.c
diff --git a/codec/index.c b/applications/codec/index.c
similarity index 100%
rename from codec/index.c
rename to applications/codec/index.c
diff --git a/codec/index.h b/applications/codec/index.h
similarity index 100%
rename from codec/index.h
rename to applications/codec/index.h
diff --git a/codec/j2k_dump.c b/applications/codec/j2k_dump.c
similarity index 100%
rename from codec/j2k_dump.c
rename to applications/codec/j2k_dump.c
diff --git a/codec/j2k_to_image.c b/applications/codec/j2k_to_image.c
similarity index 100%
rename from codec/j2k_to_image.c
rename to applications/codec/j2k_to_image.c
diff --git a/codec/windirent.h b/applications/codec/windirent.h
similarity index 100%
rename from codec/windirent.h
rename to applications/codec/windirent.h
diff --git a/common/color.c b/applications/common/color.c
similarity index 100%
rename from common/color.c
rename to applications/common/color.c
diff --git a/common/color.h b/applications/common/color.h
similarity index 100%
rename from common/color.h
rename to applications/common/color.h
diff --git a/common/format_defs.h b/applications/common/format_defs.h
similarity index 100%
rename from common/format_defs.h
rename to applications/common/format_defs.h
diff --git a/common/getopt.c b/applications/common/getopt.c
similarity index 100%
rename from common/getopt.c
rename to applications/common/getopt.c
diff --git a/common/getopt.h b/applications/common/getopt.h
similarity index 100%
rename from common/getopt.h
rename to applications/common/getopt.h
diff --git a/indexer_JPIP/CMakeLists.txt b/applications/indexer_JPIP/CMakeLists.txt
similarity index 100%
rename from indexer_JPIP/CMakeLists.txt
rename to applications/indexer_JPIP/CMakeLists.txt
diff --git a/indexer_JPIP/Makefile b/applications/indexer_JPIP/Makefile
similarity index 100%
rename from indexer_JPIP/Makefile
rename to applications/indexer_JPIP/Makefile
diff --git a/indexer_JPIP/bio.c b/applications/indexer_JPIP/bio.c
similarity index 100%
rename from indexer_JPIP/bio.c
rename to applications/indexer_JPIP/bio.c
diff --git a/indexer_JPIP/bio.h b/applications/indexer_JPIP/bio.h
similarity index 100%
rename from indexer_JPIP/bio.h
rename to applications/indexer_JPIP/bio.h
diff --git a/indexer_JPIP/cio.c b/applications/indexer_JPIP/cio.c
similarity index 100%
rename from indexer_JPIP/cio.c
rename to applications/indexer_JPIP/cio.c
diff --git a/indexer_JPIP/cio.h b/applications/indexer_JPIP/cio.h
similarity index 100%
rename from indexer_JPIP/cio.h
rename to applications/indexer_JPIP/cio.h
diff --git a/indexer_JPIP/fix.c b/applications/indexer_JPIP/fix.c
similarity index 100%
rename from indexer_JPIP/fix.c
rename to applications/indexer_JPIP/fix.c
diff --git a/indexer_JPIP/fix.h b/applications/indexer_JPIP/fix.h
similarity index 100%
rename from indexer_JPIP/fix.h
rename to applications/indexer_JPIP/fix.h
diff --git a/indexer_JPIP/index_create.c b/applications/indexer_JPIP/index_create.c
similarity index 100%
rename from indexer_JPIP/index_create.c
rename to applications/indexer_JPIP/index_create.c
diff --git a/indexer_JPIP/int.c b/applications/indexer_JPIP/int.c
similarity index 100%
rename from indexer_JPIP/int.c
rename to applications/indexer_JPIP/int.c
diff --git a/indexer_JPIP/int.h b/applications/indexer_JPIP/int.h
similarity index 100%
rename from indexer_JPIP/int.h
rename to applications/indexer_JPIP/int.h
diff --git a/indexer_JPIP/j2k.h b/applications/indexer_JPIP/j2k.h
similarity index 100%
rename from indexer_JPIP/j2k.h
rename to applications/indexer_JPIP/j2k.h
diff --git a/indexer_JPIP/jp2.c b/applications/indexer_JPIP/jp2.c
similarity index 100%
rename from indexer_JPIP/jp2.c
rename to applications/indexer_JPIP/jp2.c
diff --git a/indexer_JPIP/jp2.h b/applications/indexer_JPIP/jp2.h
similarity index 100%
rename from indexer_JPIP/jp2.h
rename to applications/indexer_JPIP/jp2.h
diff --git a/indexer_JPIP/jpip.c b/applications/indexer_JPIP/jpip.c
similarity index 100%
rename from indexer_JPIP/jpip.c
rename to applications/indexer_JPIP/jpip.c
diff --git a/indexer_JPIP/jpip.h b/applications/indexer_JPIP/jpip.h
similarity index 100%
rename from indexer_JPIP/jpip.h
rename to applications/indexer_JPIP/jpip.h
diff --git a/indexer_JPIP/pi.c b/applications/indexer_JPIP/pi.c
similarity index 100%
rename from indexer_JPIP/pi.c
rename to applications/indexer_JPIP/pi.c
diff --git a/indexer_JPIP/pi.h b/applications/indexer_JPIP/pi.h
similarity index 100%
rename from indexer_JPIP/pi.h
rename to applications/indexer_JPIP/pi.h
diff --git a/indexer_JPIP/t2.c b/applications/indexer_JPIP/t2.c
similarity index 100%
rename from indexer_JPIP/t2.c
rename to applications/indexer_JPIP/t2.c
diff --git a/indexer_JPIP/t2.h b/applications/indexer_JPIP/t2.h
similarity index 100%
rename from indexer_JPIP/t2.h
rename to applications/indexer_JPIP/t2.h
diff --git a/indexer_JPIP/tcd.c b/applications/indexer_JPIP/tcd.c
similarity index 100%
rename from indexer_JPIP/tcd.c
rename to applications/indexer_JPIP/tcd.c
diff --git a/indexer_JPIP/tcd.h b/applications/indexer_JPIP/tcd.h
similarity index 100%
rename from indexer_JPIP/tcd.h
rename to applications/indexer_JPIP/tcd.h
diff --git a/indexer_JPIP/tgt.c b/applications/indexer_JPIP/tgt.c
similarity index 100%
rename from indexer_JPIP/tgt.c
rename to applications/indexer_JPIP/tgt.c
diff --git a/indexer_JPIP/tgt.h b/applications/indexer_JPIP/tgt.h
similarity index 100%
rename from indexer_JPIP/tgt.h
rename to applications/indexer_JPIP/tgt.h
diff --git a/mj2/CMakeLists.txt b/applications/mj2/CMakeLists.txt
similarity index 100%
rename from mj2/CMakeLists.txt
rename to applications/mj2/CMakeLists.txt
diff --git a/mj2/Makefile.am b/applications/mj2/Makefile.am
similarity index 100%
rename from mj2/Makefile.am
rename to applications/mj2/Makefile.am
diff --git a/mj2/Makefile.nix b/applications/mj2/Makefile.nix
similarity index 100%
rename from mj2/Makefile.nix
rename to applications/mj2/Makefile.nix
diff --git a/mj2/extract_j2k_from_mj2.c b/applications/mj2/extract_j2k_from_mj2.c
similarity index 100%
rename from mj2/extract_j2k_from_mj2.c
rename to applications/mj2/extract_j2k_from_mj2.c
diff --git a/mj2/frames_to_mj2.c b/applications/mj2/frames_to_mj2.c
similarity index 100%
rename from mj2/frames_to_mj2.c
rename to applications/mj2/frames_to_mj2.c
diff --git a/mj2/meta_out.c b/applications/mj2/meta_out.c
similarity index 100%
rename from mj2/meta_out.c
rename to applications/mj2/meta_out.c
diff --git a/mj2/meta_out.h b/applications/mj2/meta_out.h
similarity index 100%
rename from mj2/meta_out.h
rename to applications/mj2/meta_out.h
diff --git a/mj2/mj2.c b/applications/mj2/mj2.c
similarity index 100%
rename from mj2/mj2.c
rename to applications/mj2/mj2.c
diff --git a/mj2/mj2.h b/applications/mj2/mj2.h
similarity index 100%
rename from mj2/mj2.h
rename to applications/mj2/mj2.h
diff --git a/mj2/mj2_convert.c b/applications/mj2/mj2_convert.c
similarity index 100%
rename from mj2/mj2_convert.c
rename to applications/mj2/mj2_convert.c
diff --git a/mj2/mj2_convert.h b/applications/mj2/mj2_convert.h
similarity index 100%
rename from mj2/mj2_convert.h
rename to applications/mj2/mj2_convert.h
diff --git a/mj2/mj2_to_frames.c b/applications/mj2/mj2_to_frames.c
similarity index 100%
rename from mj2/mj2_to_frames.c
rename to applications/mj2/mj2_to_frames.c
diff --git a/mj2/mj2_to_metadata.c b/applications/mj2/mj2_to_metadata.c
similarity index 100%
rename from mj2/mj2_to_metadata.c
rename to applications/mj2/mj2_to_metadata.c
diff --git a/mj2/mj2_to_metadata.dtd b/applications/mj2/mj2_to_metadata.dtd
similarity index 100%
rename from mj2/mj2_to_metadata.dtd
rename to applications/mj2/mj2_to_metadata.dtd
diff --git a/mj2/mj2_to_metadata.h b/applications/mj2/mj2_to_metadata.h
similarity index 100%
rename from mj2/mj2_to_metadata.h
rename to applications/mj2/mj2_to_metadata.h
diff --git a/mj2/mj2_to_metadata.sln b/applications/mj2/mj2_to_metadata.sln
similarity index 100%
rename from mj2/mj2_to_metadata.sln
rename to applications/mj2/mj2_to_metadata.sln
diff --git a/mj2/mj2_to_metadata.vcproj b/applications/mj2/mj2_to_metadata.vcproj
similarity index 100%
rename from mj2/mj2_to_metadata.vcproj
rename to applications/mj2/mj2_to_metadata.vcproj
diff --git a/mj2/mj2_to_metadata_Notes.doc b/applications/mj2/mj2_to_metadata_Notes.doc
similarity index 100%
rename from mj2/mj2_to_metadata_Notes.doc
rename to applications/mj2/mj2_to_metadata_Notes.doc
diff --git a/mj2/readme.txt b/applications/mj2/readme.txt
similarity index 100%
rename from mj2/readme.txt
rename to applications/mj2/readme.txt
diff --git a/mj2/wrap_j2k_in_mj2.c b/applications/mj2/wrap_j2k_in_mj2.c
similarity index 100%
rename from mj2/wrap_j2k_in_mj2.c
rename to applications/mj2/wrap_j2k_in_mj2.c
diff --git a/jpwl/CMakeLists.txt b/libopenjpeg/jpwl/CMakeLists.txt
similarity index 100%
rename from jpwl/CMakeLists.txt
rename to libopenjpeg/jpwl/CMakeLists.txt
diff --git a/jpwl/Makefile.am b/libopenjpeg/jpwl/Makefile.am
similarity index 100%
rename from jpwl/Makefile.am
rename to libopenjpeg/jpwl/Makefile.am
diff --git a/jpwl/Makefile.nix b/libopenjpeg/jpwl/Makefile.nix
similarity index 100%
rename from jpwl/Makefile.nix
rename to libopenjpeg/jpwl/Makefile.nix
diff --git a/jpwl/README.txt b/libopenjpeg/jpwl/README.txt
similarity index 100%
rename from jpwl/README.txt
rename to libopenjpeg/jpwl/README.txt
diff --git a/jpwl/crc.c b/libopenjpeg/jpwl/crc.c
similarity index 100%
rename from jpwl/crc.c
rename to libopenjpeg/jpwl/crc.c
diff --git a/jpwl/crc.h b/libopenjpeg/jpwl/crc.h
similarity index 100%
rename from jpwl/crc.h
rename to libopenjpeg/jpwl/crc.h
diff --git a/jpwl/jpwl.c b/libopenjpeg/jpwl/jpwl.c
similarity index 100%
rename from jpwl/jpwl.c
rename to libopenjpeg/jpwl/jpwl.c
diff --git a/jpwl/jpwl.h b/libopenjpeg/jpwl/jpwl.h
similarity index 100%
rename from jpwl/jpwl.h
rename to libopenjpeg/jpwl/jpwl.h
diff --git a/jpwl/jpwl_lib.c b/libopenjpeg/jpwl/jpwl_lib.c
similarity index 100%
rename from jpwl/jpwl_lib.c
rename to libopenjpeg/jpwl/jpwl_lib.c
diff --git a/jpwl/rs.c b/libopenjpeg/jpwl/rs.c
similarity index 100%
rename from jpwl/rs.c
rename to libopenjpeg/jpwl/rs.c
diff --git a/jpwl/rs.h b/libopenjpeg/jpwl/rs.h
similarity index 100%
rename from jpwl/rs.h
rename to libopenjpeg/jpwl/rs.h
diff --git a/OPJ_Validate/Makefile b/testing/Makefile
similarity index 100%
rename from OPJ_Validate/Makefile
rename to testing/Makefile
diff --git a/OPJ_Validate/OPJ_Param_File_v0_1.txt b/testing/OPJ_Param_File_v0_1.txt
similarity index 100%
rename from OPJ_Validate/OPJ_Param_File_v0_1.txt
rename to testing/OPJ_Param_File_v0_1.txt
diff --git a/OPJ_Validate/OPJ_Validate.c b/testing/OPJ_Validate.c
similarity index 100%
rename from OPJ_Validate/OPJ_Validate.c
rename to testing/OPJ_Validate.c
diff --git a/OPJ_Validate/OPJ_Validate.dsp b/testing/OPJ_Validate.dsp
similarity index 100%
rename from OPJ_Validate/OPJ_Validate.dsp
rename to testing/OPJ_Validate.dsp
diff --git a/OPJ_Validate/OPJ_Validate.dsw b/testing/OPJ_Validate.dsw
similarity index 100%
rename from OPJ_Validate/OPJ_Validate.dsw
rename to testing/OPJ_Validate.dsw
diff --git a/OPJ_Validate/OPJ_Validate_Candidate_vs_Ref.bat b/testing/OPJ_Validate_Candidate_vs_Ref.bat
similarity index 100%
rename from OPJ_Validate/OPJ_Validate_Candidate_vs_Ref.bat
rename to testing/OPJ_Validate_Candidate_vs_Ref.bat
diff --git a/OPJ_Validate/OPJ_Validate_Candidate_vs_Ref.sh b/testing/OPJ_Validate_Candidate_vs_Ref.sh
similarity index 100%
rename from OPJ_Validate/OPJ_Validate_Candidate_vs_Ref.sh
rename to testing/OPJ_Validate_Candidate_vs_Ref.sh
diff --git a/OPJ_Validate/OPJ_Validate_Create_Ref.bat b/testing/OPJ_Validate_Create_Ref.bat
similarity index 100%
rename from OPJ_Validate/OPJ_Validate_Create_Ref.bat
rename to testing/OPJ_Validate_Create_Ref.bat
diff --git a/OPJ_Validate/OPJ_Validate_Create_Ref.sh b/testing/OPJ_Validate_Create_Ref.sh
similarity index 100%
rename from OPJ_Validate/OPJ_Validate_Create_Ref.sh
rename to testing/OPJ_Validate_Create_Ref.sh
diff --git a/OPJ_Validate/README.txt b/testing/README.txt
similarity index 100%
rename from OPJ_Validate/README.txt
rename to testing/README.txt
diff --git a/OPJ_Validate/linux_OPJ_Param_File_v0_1.txt b/testing/linux_OPJ_Param_File_v0_1.txt
similarity index 100%
rename from OPJ_Validate/linux_OPJ_Param_File_v0_1.txt
rename to testing/linux_OPJ_Param_File_v0_1.txt
diff --git a/OPJ_Validate/md5.c b/testing/md5.c
similarity index 100%
rename from OPJ_Validate/md5.c
rename to testing/md5.c
diff --git a/OPJ_Validate/md5.h b/testing/md5.h
similarity index 100%
rename from OPJ_Validate/md5.h
rename to testing/md5.h
diff --git a/OPJ_Validate/original/README.txt b/testing/original/README.txt
similarity index 100%
rename from OPJ_Validate/original/README.txt
rename to testing/original/README.txt