diff --git a/contrib/media/updf/fitz/Makefile b/contrib/media/updf/fitz/Makefile
index 562ccec51..e35d18746 100755
--- a/contrib/media/updf/fitz/Makefile
+++ b/contrib/media/updf/fitz/Makefile
@@ -5,7 +5,7 @@ SDK_DIR = $(abspath ../../../sdk)
 
 CFLAGS = -c -fno-ident -O2 -fomit-frame-pointer -fno-ident -U__WIN32__ -U_Win32 -U_WIN32 -U__MINGW32__ -UWIN32 
 
-INCLUDES = -I $(SDK_DIR)/sources/newlib/libc/include -I $(SDK_DIR)/sources/freetype/include -I $(SDK_DIR)/sources/libjpeg -I $(SDK_DIR)/sources/zlib -I ../libopenjpeg -I ../libjbig2dec
+INCLUDES = -I $(SDK_DIR)/sources/newlib/libc/include -I $(SDK_DIR)/sources/freetype/include -I $(SDK_DIR)/sources/libjpeg -I $(SDK_DIR)/sources/zlib -I $(SDK_DIR)/sources/libopenjpeg -I $(SDK_DIR)/sources/libjbig2dec
 
 FITZ_SRC := $(notdir $(wildcard *.c))
 OBJECTS =  $(patsubst %.c, %.o, $(FITZ_SRC))
diff --git a/contrib/media/updf/fitz/Tupfile.lua b/contrib/media/updf/fitz/Tupfile.lua
index 2650401e1..93d27c252 100755
--- a/contrib/media/updf/fitz/Tupfile.lua
+++ b/contrib/media/updf/fitz/Tupfile.lua
@@ -6,7 +6,7 @@ tup.include(HELPERDIR .. "/use_newlib.lua")
 SDK_DIR = "../../../sdk"
 
 CFLAGS = CFLAGS .. " -std=c99 -U__WIN32__ -U_Win32 -U_WIN32 -U__MINGW32__ -UWIN32"
-INCLUDES = INCLUDES .. " -I . -I $(SDK_DIR)/sources/freetype/include -I $(SDK_DIR)/sources/libjpeg -I $(SDK_DIR)/sources/zlib -I ../libopenjpeg -I ../libjbig2dec"
+INCLUDES = INCLUDES .. " -I . -I $(SDK_DIR)/sources/freetype/include -I $(SDK_DIR)/sources/libjpeg -I $(SDK_DIR)/sources/zlib -I $(SDK_DIR)/sources/libopenjpeg -I $(SDK_DIR)/sources/libjbig2dec"
 
 compile_gcc{"base_error.c", "base_geometry.c", "base_getopt.c", "base_hash.c", "base_memory.c", "base_object.c", "base_string.c", "base_time.c", "crypt_aes.c", "crypt_arc4.c", "crypt_md5.c", "crypt_sha2.c", "dev_bbox.c", "dev_list.c", "dev_null.c", "dev_text.c", "dev_trace.c", "filt_basic.c", "filt_dctd.c", "filt_faxd.c", "filt_flate.c", "filt_jbig2d.c", "filt_jpxd.c", "filt_lzwd.c", "filt_predict.c", "lrintf.c", "obj_print.c", "res_bitmap.c", "res_colorspace.c", "res_font.c", "res_halftone.c", "res_path.c", "res_pixmap.c", "res_shade.c", "res_text.c", "stm_buffer.c", "stm_open.c", "stm_read.c", "strtoll.c", "strtoull.c"}
 tup.rule(OBJS, "kos32-ar rcs %o %f", {"../lib/libfitz.a", "<../lib/libfitz>"})
diff --git a/contrib/media/updf/libjbig2dec/Makefile b/contrib/sdk/sources/libjbig2dec/Makefile
similarity index 95%
rename from contrib/media/updf/libjbig2dec/Makefile
rename to contrib/sdk/sources/libjbig2dec/Makefile
index 7d70288fe..319ff0d55 100755
--- a/contrib/media/updf/libjbig2dec/Makefile
+++ b/contrib/sdk/sources/libjbig2dec/Makefile
@@ -12,7 +12,7 @@ OBJECTS =  $(patsubst %.c, %.o, $(SRC))
 default: $(patsubst %.c,%.o,$(SRC))
 	ar rcs libjbig2dec.a *.o
 	rm *.o
-	mv libjbig2dec.a ../lib
+	mv libjbig2dec.a ../../lib
 
 %.o : %.c Makefile $(SRC)
 	$(CC) $(CFLAGS) -DHAVE_CONFIG_H $(INCLUDES) -o $@ $<
diff --git a/contrib/media/updf/libjbig2dec/Tupfile.lua b/contrib/sdk/sources/libjbig2dec/Tupfile.lua
similarity index 86%
rename from contrib/media/updf/libjbig2dec/Tupfile.lua
rename to contrib/sdk/sources/libjbig2dec/Tupfile.lua
index 722066b54..6af9cad76 100755
--- a/contrib/media/updf/libjbig2dec/Tupfile.lua
+++ b/contrib/sdk/sources/libjbig2dec/Tupfile.lua
@@ -7,4 +7,4 @@ CFLAGS = CFLAGS .. " -std=c99 -DHAVE_CONFIG_H"
 INCLUDES = INCLUDES .. " -I ."
  
 compile_gcc{"jbig2_arith.c", "jbig2_arith_iaid.c", "jbig2_arith_int.c", "jbig2.c", "jbig2dec.c", "jbig2_generic.c", "jbig2_halftone.c", "jbig2_huffman.c", "jbig2_image.c", "jbig2_image_pbm.c", "jbig2_metadata.c", "jbig2_mmr.c", "jbig2_page.c", "jbig2_refinement.c", "jbig2_segment.c", "jbig2_symbol_dict.c", "jbig2_text.c", "memcmp.c", "sha1.c"}
-tup.rule(OBJS, "kos32-ar rcs %o %f", {"../lib/libjbig2dec.a", "<../lib/libjbig2dec>"})
+tup.rule(OBJS, "kos32-ar rcs %o %f", {"../../lib/libjbig2dec.a", "<../../lib/libjbig2dec>"})
diff --git a/contrib/media/updf/libjbig2dec/config.h b/contrib/sdk/sources/libjbig2dec/config.h
similarity index 100%
rename from contrib/media/updf/libjbig2dec/config.h
rename to contrib/sdk/sources/libjbig2dec/config.h
diff --git a/contrib/media/updf/libjbig2dec/config_types.h b/contrib/sdk/sources/libjbig2dec/config_types.h
similarity index 100%
rename from contrib/media/updf/libjbig2dec/config_types.h
rename to contrib/sdk/sources/libjbig2dec/config_types.h
diff --git a/contrib/media/updf/libjbig2dec/config_win32.h b/contrib/sdk/sources/libjbig2dec/config_win32.h
similarity index 100%
rename from contrib/media/updf/libjbig2dec/config_win32.h
rename to contrib/sdk/sources/libjbig2dec/config_win32.h
diff --git a/contrib/media/updf/libjbig2dec/getopt.h b/contrib/sdk/sources/libjbig2dec/getopt.h
similarity index 100%
rename from contrib/media/updf/libjbig2dec/getopt.h
rename to contrib/sdk/sources/libjbig2dec/getopt.h
diff --git a/contrib/media/updf/libjbig2dec/jbig2.c b/contrib/sdk/sources/libjbig2dec/jbig2.c
similarity index 100%
rename from contrib/media/updf/libjbig2dec/jbig2.c
rename to contrib/sdk/sources/libjbig2dec/jbig2.c
diff --git a/contrib/media/updf/libjbig2dec/jbig2.h b/contrib/sdk/sources/libjbig2dec/jbig2.h
similarity index 100%
rename from contrib/media/updf/libjbig2dec/jbig2.h
rename to contrib/sdk/sources/libjbig2dec/jbig2.h
diff --git a/contrib/media/updf/libjbig2dec/jbig2_arith.c b/contrib/sdk/sources/libjbig2dec/jbig2_arith.c
similarity index 100%
rename from contrib/media/updf/libjbig2dec/jbig2_arith.c
rename to contrib/sdk/sources/libjbig2dec/jbig2_arith.c
diff --git a/contrib/media/updf/libjbig2dec/jbig2_arith.h b/contrib/sdk/sources/libjbig2dec/jbig2_arith.h
similarity index 100%
rename from contrib/media/updf/libjbig2dec/jbig2_arith.h
rename to contrib/sdk/sources/libjbig2dec/jbig2_arith.h
diff --git a/contrib/media/updf/libjbig2dec/jbig2_arith_iaid.c b/contrib/sdk/sources/libjbig2dec/jbig2_arith_iaid.c
similarity index 100%
rename from contrib/media/updf/libjbig2dec/jbig2_arith_iaid.c
rename to contrib/sdk/sources/libjbig2dec/jbig2_arith_iaid.c
diff --git a/contrib/media/updf/libjbig2dec/jbig2_arith_iaid.h b/contrib/sdk/sources/libjbig2dec/jbig2_arith_iaid.h
similarity index 100%
rename from contrib/media/updf/libjbig2dec/jbig2_arith_iaid.h
rename to contrib/sdk/sources/libjbig2dec/jbig2_arith_iaid.h
diff --git a/contrib/media/updf/libjbig2dec/jbig2_arith_int.c b/contrib/sdk/sources/libjbig2dec/jbig2_arith_int.c
similarity index 100%
rename from contrib/media/updf/libjbig2dec/jbig2_arith_int.c
rename to contrib/sdk/sources/libjbig2dec/jbig2_arith_int.c
diff --git a/contrib/media/updf/libjbig2dec/jbig2_arith_int.h b/contrib/sdk/sources/libjbig2dec/jbig2_arith_int.h
similarity index 100%
rename from contrib/media/updf/libjbig2dec/jbig2_arith_int.h
rename to contrib/sdk/sources/libjbig2dec/jbig2_arith_int.h
diff --git a/contrib/media/updf/libjbig2dec/jbig2_generic.c b/contrib/sdk/sources/libjbig2dec/jbig2_generic.c
similarity index 100%
rename from contrib/media/updf/libjbig2dec/jbig2_generic.c
rename to contrib/sdk/sources/libjbig2dec/jbig2_generic.c
diff --git a/contrib/media/updf/libjbig2dec/jbig2_generic.h b/contrib/sdk/sources/libjbig2dec/jbig2_generic.h
similarity index 100%
rename from contrib/media/updf/libjbig2dec/jbig2_generic.h
rename to contrib/sdk/sources/libjbig2dec/jbig2_generic.h
diff --git a/contrib/media/updf/libjbig2dec/jbig2_halftone.c b/contrib/sdk/sources/libjbig2dec/jbig2_halftone.c
similarity index 100%
rename from contrib/media/updf/libjbig2dec/jbig2_halftone.c
rename to contrib/sdk/sources/libjbig2dec/jbig2_halftone.c
diff --git a/contrib/media/updf/libjbig2dec/jbig2_huffman.c b/contrib/sdk/sources/libjbig2dec/jbig2_huffman.c
similarity index 100%
rename from contrib/media/updf/libjbig2dec/jbig2_huffman.c
rename to contrib/sdk/sources/libjbig2dec/jbig2_huffman.c
diff --git a/contrib/media/updf/libjbig2dec/jbig2_huffman.h b/contrib/sdk/sources/libjbig2dec/jbig2_huffman.h
similarity index 100%
rename from contrib/media/updf/libjbig2dec/jbig2_huffman.h
rename to contrib/sdk/sources/libjbig2dec/jbig2_huffman.h
diff --git a/contrib/media/updf/libjbig2dec/jbig2_hufftab.h b/contrib/sdk/sources/libjbig2dec/jbig2_hufftab.h
similarity index 100%
rename from contrib/media/updf/libjbig2dec/jbig2_hufftab.h
rename to contrib/sdk/sources/libjbig2dec/jbig2_hufftab.h
diff --git a/contrib/media/updf/libjbig2dec/jbig2_image.c b/contrib/sdk/sources/libjbig2dec/jbig2_image.c
similarity index 100%
rename from contrib/media/updf/libjbig2dec/jbig2_image.c
rename to contrib/sdk/sources/libjbig2dec/jbig2_image.c
diff --git a/contrib/media/updf/libjbig2dec/jbig2_image.h b/contrib/sdk/sources/libjbig2dec/jbig2_image.h
similarity index 100%
rename from contrib/media/updf/libjbig2dec/jbig2_image.h
rename to contrib/sdk/sources/libjbig2dec/jbig2_image.h
diff --git a/contrib/media/updf/libjbig2dec/jbig2_image_pbm.c b/contrib/sdk/sources/libjbig2dec/jbig2_image_pbm.c
similarity index 100%
rename from contrib/media/updf/libjbig2dec/jbig2_image_pbm.c
rename to contrib/sdk/sources/libjbig2dec/jbig2_image_pbm.c
diff --git a/contrib/media/updf/libjbig2dec/jbig2_metadata.c b/contrib/sdk/sources/libjbig2dec/jbig2_metadata.c
similarity index 100%
rename from contrib/media/updf/libjbig2dec/jbig2_metadata.c
rename to contrib/sdk/sources/libjbig2dec/jbig2_metadata.c
diff --git a/contrib/media/updf/libjbig2dec/jbig2_metadata.h b/contrib/sdk/sources/libjbig2dec/jbig2_metadata.h
similarity index 100%
rename from contrib/media/updf/libjbig2dec/jbig2_metadata.h
rename to contrib/sdk/sources/libjbig2dec/jbig2_metadata.h
diff --git a/contrib/media/updf/libjbig2dec/jbig2_mmr.c b/contrib/sdk/sources/libjbig2dec/jbig2_mmr.c
similarity index 100%
rename from contrib/media/updf/libjbig2dec/jbig2_mmr.c
rename to contrib/sdk/sources/libjbig2dec/jbig2_mmr.c
diff --git a/contrib/media/updf/libjbig2dec/jbig2_mmr.h b/contrib/sdk/sources/libjbig2dec/jbig2_mmr.h
similarity index 100%
rename from contrib/media/updf/libjbig2dec/jbig2_mmr.h
rename to contrib/sdk/sources/libjbig2dec/jbig2_mmr.h
diff --git a/contrib/media/updf/libjbig2dec/jbig2_page.c b/contrib/sdk/sources/libjbig2dec/jbig2_page.c
similarity index 100%
rename from contrib/media/updf/libjbig2dec/jbig2_page.c
rename to contrib/sdk/sources/libjbig2dec/jbig2_page.c
diff --git a/contrib/media/updf/libjbig2dec/jbig2_priv.h b/contrib/sdk/sources/libjbig2dec/jbig2_priv.h
similarity index 100%
rename from contrib/media/updf/libjbig2dec/jbig2_priv.h
rename to contrib/sdk/sources/libjbig2dec/jbig2_priv.h
diff --git a/contrib/media/updf/libjbig2dec/jbig2_refinement.c b/contrib/sdk/sources/libjbig2dec/jbig2_refinement.c
similarity index 100%
rename from contrib/media/updf/libjbig2dec/jbig2_refinement.c
rename to contrib/sdk/sources/libjbig2dec/jbig2_refinement.c
diff --git a/contrib/media/updf/libjbig2dec/jbig2_segment.c b/contrib/sdk/sources/libjbig2dec/jbig2_segment.c
similarity index 100%
rename from contrib/media/updf/libjbig2dec/jbig2_segment.c
rename to contrib/sdk/sources/libjbig2dec/jbig2_segment.c
diff --git a/contrib/media/updf/libjbig2dec/jbig2_symbol_dict.c b/contrib/sdk/sources/libjbig2dec/jbig2_symbol_dict.c
similarity index 100%
rename from contrib/media/updf/libjbig2dec/jbig2_symbol_dict.c
rename to contrib/sdk/sources/libjbig2dec/jbig2_symbol_dict.c
diff --git a/contrib/media/updf/libjbig2dec/jbig2_symbol_dict.h b/contrib/sdk/sources/libjbig2dec/jbig2_symbol_dict.h
similarity index 100%
rename from contrib/media/updf/libjbig2dec/jbig2_symbol_dict.h
rename to contrib/sdk/sources/libjbig2dec/jbig2_symbol_dict.h
diff --git a/contrib/media/updf/libjbig2dec/jbig2_text.c b/contrib/sdk/sources/libjbig2dec/jbig2_text.c
similarity index 100%
rename from contrib/media/updf/libjbig2dec/jbig2_text.c
rename to contrib/sdk/sources/libjbig2dec/jbig2_text.c
diff --git a/contrib/media/updf/libjbig2dec/jbig2_text.h b/contrib/sdk/sources/libjbig2dec/jbig2_text.h
similarity index 100%
rename from contrib/media/updf/libjbig2dec/jbig2_text.h
rename to contrib/sdk/sources/libjbig2dec/jbig2_text.h
diff --git a/contrib/media/updf/libjbig2dec/jbig2dec.c b/contrib/sdk/sources/libjbig2dec/jbig2dec.c
similarity index 100%
rename from contrib/media/updf/libjbig2dec/jbig2dec.c
rename to contrib/sdk/sources/libjbig2dec/jbig2dec.c
diff --git a/contrib/media/updf/libjbig2dec/memcmp.c b/contrib/sdk/sources/libjbig2dec/memcmp.c
similarity index 100%
rename from contrib/media/updf/libjbig2dec/memcmp.c
rename to contrib/sdk/sources/libjbig2dec/memcmp.c
diff --git a/contrib/media/updf/libjbig2dec/os_types.h b/contrib/sdk/sources/libjbig2dec/os_types.h
similarity index 100%
rename from contrib/media/updf/libjbig2dec/os_types.h
rename to contrib/sdk/sources/libjbig2dec/os_types.h
diff --git a/contrib/media/updf/libjbig2dec/sha1.c b/contrib/sdk/sources/libjbig2dec/sha1.c
similarity index 100%
rename from contrib/media/updf/libjbig2dec/sha1.c
rename to contrib/sdk/sources/libjbig2dec/sha1.c
diff --git a/contrib/media/updf/libjbig2dec/sha1.h b/contrib/sdk/sources/libjbig2dec/sha1.h
similarity index 100%
rename from contrib/media/updf/libjbig2dec/sha1.h
rename to contrib/sdk/sources/libjbig2dec/sha1.h
diff --git a/contrib/media/updf/libopenjpeg/Makefile b/contrib/sdk/sources/libopenjpeg/Makefile
similarity index 94%
rename from contrib/media/updf/libopenjpeg/Makefile
rename to contrib/sdk/sources/libopenjpeg/Makefile
index 87deeb9a2..818579e70 100755
--- a/contrib/media/updf/libopenjpeg/Makefile
+++ b/contrib/sdk/sources/libopenjpeg/Makefile
@@ -12,7 +12,7 @@ OBJECTS =  $(patsubst %.c, %.o, $(SRC))
 default: $(patsubst %.c,%.o,$(SRC))
 	ar rcs libopenjpeg.a *.o
 	rm *.o
-	mv libopenjpeg.a ../lib
+	mv libopenjpeg.a ../../lib
 
 %.o : %.c Makefile $(SRC)
 	$(CC) $(CFLAGS) $(INCLUDES) -o $@ $<
diff --git a/contrib/media/updf/libopenjpeg/Tupfile.lua b/contrib/sdk/sources/libopenjpeg/Tupfile.lua
similarity index 85%
rename from contrib/media/updf/libopenjpeg/Tupfile.lua
rename to contrib/sdk/sources/libopenjpeg/Tupfile.lua
index 0c10f4fe7..03623ccb0 100755
--- a/contrib/media/updf/libopenjpeg/Tupfile.lua
+++ b/contrib/sdk/sources/libopenjpeg/Tupfile.lua
@@ -9,4 +9,4 @@ CFLAGS = CFLAGS .. " -std=c99 -U__WIN32__ -U_Win32 -U_WIN32 -U__MINGW32__ -UWIN3
 INCLUDES = INCLUDES .. " -I ."
 
 compile_gcc{"bio.c", "cio.c", "dwt.c", "event.c", "image.c", "j2k.c", "j2k_lib.c", "jp2.c", "jpt.c", "lrintf.c", "mct.c", "mqc.c", "openjpeg.c", "pi.c", "raw.c", "t1.c", "t1_generate_luts.c", "t2.c", "tcd.c", "tgt.c"}
-tup.rule(OBJS, "kos32-ar rcs %o %f", {"../lib/libopenjpeg.a", "<../lib/libopenjpeg>"})
+tup.rule(OBJS, "kos32-ar rcs %o %f", {"../../lib/libopenjpeg.a", "<../../lib/libopenjpeg>"})
diff --git a/contrib/media/updf/libopenjpeg/bio.c b/contrib/sdk/sources/libopenjpeg/bio.c
similarity index 100%
rename from contrib/media/updf/libopenjpeg/bio.c
rename to contrib/sdk/sources/libopenjpeg/bio.c
diff --git a/contrib/media/updf/libopenjpeg/bio.h b/contrib/sdk/sources/libopenjpeg/bio.h
similarity index 100%
rename from contrib/media/updf/libopenjpeg/bio.h
rename to contrib/sdk/sources/libopenjpeg/bio.h
diff --git a/contrib/media/updf/libopenjpeg/cio.c b/contrib/sdk/sources/libopenjpeg/cio.c
similarity index 100%
rename from contrib/media/updf/libopenjpeg/cio.c
rename to contrib/sdk/sources/libopenjpeg/cio.c
diff --git a/contrib/media/updf/libopenjpeg/cio.h b/contrib/sdk/sources/libopenjpeg/cio.h
similarity index 100%
rename from contrib/media/updf/libopenjpeg/cio.h
rename to contrib/sdk/sources/libopenjpeg/cio.h
diff --git a/contrib/media/updf/libopenjpeg/dwt.c b/contrib/sdk/sources/libopenjpeg/dwt.c
similarity index 100%
rename from contrib/media/updf/libopenjpeg/dwt.c
rename to contrib/sdk/sources/libopenjpeg/dwt.c
diff --git a/contrib/media/updf/libopenjpeg/dwt.h b/contrib/sdk/sources/libopenjpeg/dwt.h
similarity index 100%
rename from contrib/media/updf/libopenjpeg/dwt.h
rename to contrib/sdk/sources/libopenjpeg/dwt.h
diff --git a/contrib/media/updf/libopenjpeg/event.c b/contrib/sdk/sources/libopenjpeg/event.c
similarity index 100%
rename from contrib/media/updf/libopenjpeg/event.c
rename to contrib/sdk/sources/libopenjpeg/event.c
diff --git a/contrib/media/updf/libopenjpeg/event.h b/contrib/sdk/sources/libopenjpeg/event.h
similarity index 100%
rename from contrib/media/updf/libopenjpeg/event.h
rename to contrib/sdk/sources/libopenjpeg/event.h
diff --git a/contrib/media/updf/libopenjpeg/fix.h b/contrib/sdk/sources/libopenjpeg/fix.h
similarity index 100%
rename from contrib/media/updf/libopenjpeg/fix.h
rename to contrib/sdk/sources/libopenjpeg/fix.h
diff --git a/contrib/media/updf/libopenjpeg/image.c b/contrib/sdk/sources/libopenjpeg/image.c
similarity index 100%
rename from contrib/media/updf/libopenjpeg/image.c
rename to contrib/sdk/sources/libopenjpeg/image.c
diff --git a/contrib/media/updf/libopenjpeg/image.h b/contrib/sdk/sources/libopenjpeg/image.h
similarity index 100%
rename from contrib/media/updf/libopenjpeg/image.h
rename to contrib/sdk/sources/libopenjpeg/image.h
diff --git a/contrib/media/updf/libopenjpeg/int.h b/contrib/sdk/sources/libopenjpeg/int.h
similarity index 100%
rename from contrib/media/updf/libopenjpeg/int.h
rename to contrib/sdk/sources/libopenjpeg/int.h
diff --git a/contrib/media/updf/libopenjpeg/j2k.c b/contrib/sdk/sources/libopenjpeg/j2k.c
similarity index 100%
rename from contrib/media/updf/libopenjpeg/j2k.c
rename to contrib/sdk/sources/libopenjpeg/j2k.c
diff --git a/contrib/media/updf/libopenjpeg/j2k.h b/contrib/sdk/sources/libopenjpeg/j2k.h
similarity index 100%
rename from contrib/media/updf/libopenjpeg/j2k.h
rename to contrib/sdk/sources/libopenjpeg/j2k.h
diff --git a/contrib/media/updf/libopenjpeg/j2k_lib.c b/contrib/sdk/sources/libopenjpeg/j2k_lib.c
similarity index 100%
rename from contrib/media/updf/libopenjpeg/j2k_lib.c
rename to contrib/sdk/sources/libopenjpeg/j2k_lib.c
diff --git a/contrib/media/updf/libopenjpeg/j2k_lib.h b/contrib/sdk/sources/libopenjpeg/j2k_lib.h
similarity index 100%
rename from contrib/media/updf/libopenjpeg/j2k_lib.h
rename to contrib/sdk/sources/libopenjpeg/j2k_lib.h
diff --git a/contrib/media/updf/libopenjpeg/jp2.c b/contrib/sdk/sources/libopenjpeg/jp2.c
similarity index 100%
rename from contrib/media/updf/libopenjpeg/jp2.c
rename to contrib/sdk/sources/libopenjpeg/jp2.c
diff --git a/contrib/media/updf/libopenjpeg/jp2.h b/contrib/sdk/sources/libopenjpeg/jp2.h
similarity index 100%
rename from contrib/media/updf/libopenjpeg/jp2.h
rename to contrib/sdk/sources/libopenjpeg/jp2.h
diff --git a/contrib/media/updf/libopenjpeg/jpt.c b/contrib/sdk/sources/libopenjpeg/jpt.c
similarity index 100%
rename from contrib/media/updf/libopenjpeg/jpt.c
rename to contrib/sdk/sources/libopenjpeg/jpt.c
diff --git a/contrib/media/updf/libopenjpeg/jpt.h b/contrib/sdk/sources/libopenjpeg/jpt.h
similarity index 100%
rename from contrib/media/updf/libopenjpeg/jpt.h
rename to contrib/sdk/sources/libopenjpeg/jpt.h
diff --git a/contrib/media/updf/libopenjpeg/lrintf.c b/contrib/sdk/sources/libopenjpeg/lrintf.c
similarity index 100%
rename from contrib/media/updf/libopenjpeg/lrintf.c
rename to contrib/sdk/sources/libopenjpeg/lrintf.c
diff --git a/contrib/media/updf/libopenjpeg/mct.c b/contrib/sdk/sources/libopenjpeg/mct.c
similarity index 100%
rename from contrib/media/updf/libopenjpeg/mct.c
rename to contrib/sdk/sources/libopenjpeg/mct.c
diff --git a/contrib/media/updf/libopenjpeg/mct.h b/contrib/sdk/sources/libopenjpeg/mct.h
similarity index 100%
rename from contrib/media/updf/libopenjpeg/mct.h
rename to contrib/sdk/sources/libopenjpeg/mct.h
diff --git a/contrib/media/updf/libopenjpeg/mqc.c b/contrib/sdk/sources/libopenjpeg/mqc.c
similarity index 100%
rename from contrib/media/updf/libopenjpeg/mqc.c
rename to contrib/sdk/sources/libopenjpeg/mqc.c
diff --git a/contrib/media/updf/libopenjpeg/mqc.h b/contrib/sdk/sources/libopenjpeg/mqc.h
similarity index 100%
rename from contrib/media/updf/libopenjpeg/mqc.h
rename to contrib/sdk/sources/libopenjpeg/mqc.h
diff --git a/contrib/media/updf/libopenjpeg/openjpeg.c b/contrib/sdk/sources/libopenjpeg/openjpeg.c
similarity index 100%
rename from contrib/media/updf/libopenjpeg/openjpeg.c
rename to contrib/sdk/sources/libopenjpeg/openjpeg.c
diff --git a/contrib/media/updf/libopenjpeg/openjpeg.h b/contrib/sdk/sources/libopenjpeg/openjpeg.h
similarity index 100%
rename from contrib/media/updf/libopenjpeg/openjpeg.h
rename to contrib/sdk/sources/libopenjpeg/openjpeg.h
diff --git a/contrib/media/updf/libopenjpeg/opj_config.h b/contrib/sdk/sources/libopenjpeg/opj_config.h
similarity index 100%
rename from contrib/media/updf/libopenjpeg/opj_config.h
rename to contrib/sdk/sources/libopenjpeg/opj_config.h
diff --git a/contrib/media/updf/libopenjpeg/opj_includes.h b/contrib/sdk/sources/libopenjpeg/opj_includes.h
similarity index 100%
rename from contrib/media/updf/libopenjpeg/opj_includes.h
rename to contrib/sdk/sources/libopenjpeg/opj_includes.h
diff --git a/contrib/media/updf/libopenjpeg/opj_malloc.h b/contrib/sdk/sources/libopenjpeg/opj_malloc.h
similarity index 100%
rename from contrib/media/updf/libopenjpeg/opj_malloc.h
rename to contrib/sdk/sources/libopenjpeg/opj_malloc.h
diff --git a/contrib/media/updf/libopenjpeg/pi.c b/contrib/sdk/sources/libopenjpeg/pi.c
similarity index 100%
rename from contrib/media/updf/libopenjpeg/pi.c
rename to contrib/sdk/sources/libopenjpeg/pi.c
diff --git a/contrib/media/updf/libopenjpeg/pi.h b/contrib/sdk/sources/libopenjpeg/pi.h
similarity index 100%
rename from contrib/media/updf/libopenjpeg/pi.h
rename to contrib/sdk/sources/libopenjpeg/pi.h
diff --git a/contrib/media/updf/libopenjpeg/raw.c b/contrib/sdk/sources/libopenjpeg/raw.c
similarity index 100%
rename from contrib/media/updf/libopenjpeg/raw.c
rename to contrib/sdk/sources/libopenjpeg/raw.c
diff --git a/contrib/media/updf/libopenjpeg/raw.h b/contrib/sdk/sources/libopenjpeg/raw.h
similarity index 100%
rename from contrib/media/updf/libopenjpeg/raw.h
rename to contrib/sdk/sources/libopenjpeg/raw.h
diff --git a/contrib/media/updf/libopenjpeg/t1.c b/contrib/sdk/sources/libopenjpeg/t1.c
similarity index 100%
rename from contrib/media/updf/libopenjpeg/t1.c
rename to contrib/sdk/sources/libopenjpeg/t1.c
diff --git a/contrib/media/updf/libopenjpeg/t1.h b/contrib/sdk/sources/libopenjpeg/t1.h
similarity index 100%
rename from contrib/media/updf/libopenjpeg/t1.h
rename to contrib/sdk/sources/libopenjpeg/t1.h
diff --git a/contrib/media/updf/libopenjpeg/t1_generate_luts.c b/contrib/sdk/sources/libopenjpeg/t1_generate_luts.c
similarity index 100%
rename from contrib/media/updf/libopenjpeg/t1_generate_luts.c
rename to contrib/sdk/sources/libopenjpeg/t1_generate_luts.c
diff --git a/contrib/media/updf/libopenjpeg/t1_luts.h b/contrib/sdk/sources/libopenjpeg/t1_luts.h
similarity index 100%
rename from contrib/media/updf/libopenjpeg/t1_luts.h
rename to contrib/sdk/sources/libopenjpeg/t1_luts.h
diff --git a/contrib/media/updf/libopenjpeg/t2.c b/contrib/sdk/sources/libopenjpeg/t2.c
similarity index 100%
rename from contrib/media/updf/libopenjpeg/t2.c
rename to contrib/sdk/sources/libopenjpeg/t2.c
diff --git a/contrib/media/updf/libopenjpeg/t2.h b/contrib/sdk/sources/libopenjpeg/t2.h
similarity index 100%
rename from contrib/media/updf/libopenjpeg/t2.h
rename to contrib/sdk/sources/libopenjpeg/t2.h
diff --git a/contrib/media/updf/libopenjpeg/tcd.c b/contrib/sdk/sources/libopenjpeg/tcd.c
similarity index 100%
rename from contrib/media/updf/libopenjpeg/tcd.c
rename to contrib/sdk/sources/libopenjpeg/tcd.c
diff --git a/contrib/media/updf/libopenjpeg/tcd.h b/contrib/sdk/sources/libopenjpeg/tcd.h
similarity index 100%
rename from contrib/media/updf/libopenjpeg/tcd.h
rename to contrib/sdk/sources/libopenjpeg/tcd.h
diff --git a/contrib/media/updf/libopenjpeg/tgt.c b/contrib/sdk/sources/libopenjpeg/tgt.c
similarity index 100%
rename from contrib/media/updf/libopenjpeg/tgt.c
rename to contrib/sdk/sources/libopenjpeg/tgt.c
diff --git a/contrib/media/updf/libopenjpeg/tgt.h b/contrib/sdk/sources/libopenjpeg/tgt.h
similarity index 100%
rename from contrib/media/updf/libopenjpeg/tgt.h
rename to contrib/sdk/sources/libopenjpeg/tgt.h