diff --git a/headers/private/media/experimental/AdapterIO.h b/headers/os/codec/AdapterIO.h
similarity index 100%
rename from headers/private/media/experimental/AdapterIO.h
rename to headers/os/codec/AdapterIO.h
diff --git a/headers/private/media/experimental/MediaIO.h b/headers/os/codec/MediaIO.h
similarity index 100%
rename from headers/private/media/experimental/MediaIO.h
rename to headers/os/codec/MediaIO.h
diff --git a/src/kits/media/experimental/AdapterIO.cpp b/src/kits/codec/AdapterIO.cpp
similarity index 100%
rename from src/kits/media/experimental/AdapterIO.cpp
rename to src/kits/codec/AdapterIO.cpp
diff --git a/src/kits/codec/Jamfile b/src/kits/codec/Jamfile
index a3bae80bdb..33c5565eeb 100644
--- a/src/kits/codec/Jamfile
+++ b/src/kits/codec/Jamfile
@@ -1,28 +1,22 @@
 SubDir HAIKU_TOP src kits codec ;
 
-UsePrivateHeaders media shared ;
-UsePrivateHeaders [ FDirName media experimental ] ;
+UsePrivateHeaders app media shared ;
 
 if $(CHECK_MALLOC) {
 	SubDirC++Flags -D_NO_INLINE_ASM -fcheck-memory-usage ;
 }
 
+
 local architectureObject ;
 for architectureObject in [ MultiArchSubDirSetup ] {
 	on $(architectureObject) {
 
-		SharedLibrary [ MultiArchDefaultGristFiles libcodec.so ] :
-			# Experimental Media Kit
-			#AdapterIO.cpp
-			#MediaClient.cpp
-			#MediaClientDefs.cpp
-			#MediaClientNode.cpp
-			#MediaConnection.cpp
-			#MediaIO.cpp
-			#SimpleMediaClient.cpp
+SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits media ] ;
 
-			# Internal Functionality
-			AddOnManager.cpp
+		SharedLibrary [ MultiArchDefaultGristFiles libcodec.so ] :
+			# Adapter Kit
+			AdapterIO.cpp
+			MediaIO.cpp
 
 			# Codec Plugin API
 			ChunkCache.cpp
@@ -37,6 +31,15 @@ for architectureObject in [ MultiArchSubDirSetup ] {
 			StreamerPlugin.cpp
 			WriterPlugin.cpp
 
+			# Internal Functionality
+			AddOnManager.cpp
+			FormatManager.cpp
+
+			# We need this to do not depend on libmedia
+			# will be removed when libmedia2 is introduced
+			RealtimeAlloc.cpp
+			MediaFormats.cpp
+
 			:
 			be localestub shared
 			[ TargetLibsupc++ ] [ TargetLibstdc++ ]
diff --git a/src/kits/media/experimental/MediaIO.cpp b/src/kits/codec/MediaIO.cpp
similarity index 100%
rename from src/kits/media/experimental/MediaIO.cpp
rename to src/kits/codec/MediaIO.cpp
diff --git a/src/kits/media/Jamfile b/src/kits/media/Jamfile
index ad070aa2f1..79cd511185 100644
--- a/src/kits/media/Jamfile
+++ b/src/kits/media/Jamfile
@@ -48,12 +48,10 @@ for architectureObject in [ MultiArchSubDirSetup ] {
 			TimeSource.cpp
 
 			# Experimental Media Kit
-			AdapterIO.cpp
 			MediaClient.cpp
 			MediaClientDefs.cpp
 			MediaClientNode.cpp
 			MediaConnection.cpp
-			MediaIO.cpp
 			SimpleMediaClient.cpp
 
 			# Internal Functionality
@@ -83,7 +81,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
 			!missing_symbols.cpp
 			Deprecated.cpp
 			:
-			be codec localestub shared
+			be libcodec.so localestub shared
 			[ TargetLibsupc++ ] [ TargetLibstdc++ ]
 			;
 	}