diff --git a/app/avTranscoder/avTranscoder.cpp b/app/avTranscoder/avTranscoder.cpp
index 7ecdde44..66d7ec2c 100644
--- a/app/avTranscoder/avTranscoder.cpp
+++ b/app/avTranscoder/avTranscoder.cpp
@@ -26,13 +26,13 @@ void transcodeVideo( const char* inputfilename, const char* outputFilename )
 
 	// init video decoders
 	InputVideo inputVideo( input.getStream( 0 ) );
-	ImageDesc imageDesc = input.getStream( 0 ).getVideoDesc().getImageDesc();
-	Image sourceImage( imageDesc );
+	VideoFrameDesc VideoFrameDesc = input.getStream( 0 ).getVideoDesc().getVideoFrameDesc();
+	VideoFrame sourceImage( VideoFrameDesc );
 
 	// init video encoder
 	OutputVideo outputVideo;
-	outputVideo.setProfile( profile.getProfile( "xdcamhd422" ), imageDesc );
-	Image imageToEncode( outputVideo.getVideoDesc().getImageDesc() );
+	outputVideo.setProfile( profile.getProfile( "xdcamhd422" ), VideoFrameDesc );
+	VideoFrame imageToEncode( outputVideo.getVideoDesc().getVideoFrameDesc() );
 	
 	DataStream codedImage;
 
diff --git a/app/avplay/AvReader.hpp b/app/avplay/AvReader.hpp
index 32c0cc1d..ed1c159e 100644
--- a/app/avplay/AvReader.hpp
+++ b/app/avplay/AvReader.hpp
@@ -29,7 +29,7 @@ class AvReader : public Reader
 		
 		m_inputVideo->setup();
 
-		m_sourceImage = new avtranscoder::Image( m_inputFile.getStream( m_videoStream ).getVideoDesc().getImageDesc() );
+		m_sourceImage = new avtranscoder::VideoFrame( m_inputFile.getStream( m_videoStream ).getVideoDesc().getVideoFrameDesc() );
 
 		pixel.setBitsPerPixel( getComponents() * getBitDepth() );
 		pixel.setComponents( getComponents() );
@@ -38,13 +38,13 @@ class AvReader : public Reader
 		pixel.setAlpha( false );
 		pixel.setPlanar( false );
 
-		imageDescToDisplay.setWidth( m_sourceImage->desc().getWidth() );
-		imageDescToDisplay.setHeight( m_sourceImage->desc().getHeight() );
-		imageDescToDisplay.setDar( m_sourceImage->desc().getDar() );
+		VideoFrameDescToDisplay.setWidth( m_sourceImage->desc().getWidth() );
+		VideoFrameDescToDisplay.setHeight( m_sourceImage->desc().getHeight() );
+		VideoFrameDescToDisplay.setDar( m_sourceImage->desc().getDar() );
 		
-		imageDescToDisplay.setPixel( pixel.findPixel() );
+		VideoFrameDescToDisplay.setPixel( pixel.findPixel() );
 		
-		m_imageToDisplay = new avtranscoder::Image( imageDescToDisplay );
+		m_imageToDisplay = new avtranscoder::VideoFrame( VideoFrameDescToDisplay );
 	}
 
 	~AvReader()
@@ -106,11 +106,11 @@ class AvReader : public Reader
 	
 	avtranscoder::InputVideo* m_inputVideo;
 
-	avtranscoder::Image* m_sourceImage;
-	avtranscoder::Image* m_imageToDisplay;
+	avtranscoder::VideoFrame* m_sourceImage;
+	avtranscoder::VideoFrame* m_imageToDisplay;
 
 	avtranscoder::Pixel pixel;
-	avtranscoder::ImageDesc imageDescToDisplay;
+	avtranscoder::VideoFrameDesc VideoFrameDescToDisplay;
 
 	avtranscoder::VideoEssenceTransform m_videoEssenceTransform;
 	size_t m_videoStream;
diff --git a/app/presetChecker/presetChecker.cpp b/app/presetChecker/presetChecker.cpp
index 5d37342e..a4304feb 100644
--- a/app/presetChecker/presetChecker.cpp
+++ b/app/presetChecker/presetChecker.cpp
@@ -25,7 +25,7 @@ int main( int argc, char** argv )
 		if( profile.find( avtranscoder::Profile::avProfileType )->second == avtranscoder::Profile::avProfileTypeVideo )
 		{
 			avtranscoder::OutputVideo outputVideo;
-			outputVideo.setProfile( profile, outputVideo.getVideoDesc().getImageDesc() );
+			outputVideo.setProfile( profile, outputVideo.getVideoDesc().getVideoFrameDesc() );
 		}
 
 		if( profile.find( avtranscoder::Profile::avProfileType )->second == avtranscoder::Profile::avProfileTypeAudio )
diff --git a/src/AvTranscoder/CodedStream/AvInputStream.cpp b/src/AvTranscoder/CodedStream/AvInputStream.cpp
index 7cd36151..1ce12543 100644
--- a/src/AvTranscoder/CodedStream/AvInputStream.cpp
+++ b/src/AvTranscoder/CodedStream/AvInputStream.cpp
@@ -9,9 +9,6 @@ extern "C" {
 
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
-#include <libavutil/avutil.h>
-#include <libavutil/pixdesc.h>
-#include <libavutil/avstring.h>
 }
 
 #include <stdexcept>
diff --git a/src/AvTranscoder/CodedStream/AvInputStream.hpp b/src/AvTranscoder/CodedStream/AvInputStream.hpp
index 611e4dac..e68f7d57 100644
--- a/src/AvTranscoder/CodedStream/AvInputStream.hpp
+++ b/src/AvTranscoder/CodedStream/AvInputStream.hpp
@@ -3,6 +3,8 @@
 
 #include "InputStream.hpp"
 
+#include <AvTranscoder/CodedStructures/DataStreamDesc.hpp>
+
 namespace avtranscoder
 {
 
diff --git a/src/AvTranscoder/CodedStream/AvOutputStream.cpp b/src/AvTranscoder/CodedStream/AvOutputStream.cpp
index 7f8be7b5..7220a933 100644
--- a/src/AvTranscoder/CodedStream/AvOutputStream.cpp
+++ b/src/AvTranscoder/CodedStream/AvOutputStream.cpp
@@ -3,7 +3,6 @@
 #include <AvTranscoder/File/OutputFile.hpp>
 
 #include <cassert>
-#include <iostream>
 
 namespace avtranscoder
 {
diff --git a/src/AvTranscoder/CodedStream/InputStream.hpp b/src/AvTranscoder/CodedStream/InputStream.hpp
index 0350fe24..9c578f5b 100644
--- a/src/AvTranscoder/CodedStream/InputStream.hpp
+++ b/src/AvTranscoder/CodedStream/InputStream.hpp
@@ -1,9 +1,9 @@
 #ifndef _AV_TRANSCODER_CODED_STREAM_INPUT_STREAM_HPP_
 #define _AV_TRANSCODER_CODED_STREAM_INPUT_STREAM_HPP_
 
-#include <AvTranscoder/DatasStructures/DataStreamDesc.hpp>
-#include <AvTranscoder/DatasStructures/AudioDesc.hpp>
-#include <AvTranscoder/DatasStructures/VideoDesc.hpp>
+#include <AvTranscoder/CodedStructures/DataStreamDesc.hpp>
+#include <AvTranscoder/CodedStructures/AudioDesc.hpp>
+#include <AvTranscoder/CodedStructures/VideoDesc.hpp>
 
 namespace avtranscoder
 {
diff --git a/src/AvTranscoder/CodedStream/OutputStream.hpp b/src/AvTranscoder/CodedStream/OutputStream.hpp
index 9a8b08f6..8a733565 100644
--- a/src/AvTranscoder/CodedStream/OutputStream.hpp
+++ b/src/AvTranscoder/CodedStream/OutputStream.hpp
@@ -1,9 +1,9 @@
 #ifndef _AV_TRANSCODER_CODED_STREAM_OUTPUT_STREAM_HPP_
 #define _AV_TRANSCODER_CODED_STREAM_OUTPUT_STREAM_HPP_
 
-#include <AvTranscoder/DatasStructures/DataStreamDesc.hpp>
-#include <AvTranscoder/DatasStructures/AudioDesc.hpp>
-#include <AvTranscoder/DatasStructures/VideoDesc.hpp>
+#include <AvTranscoder/CodedStructures/DataStreamDesc.hpp>
+#include <AvTranscoder/CodedStructures/AudioDesc.hpp>
+#include <AvTranscoder/CodedStructures/VideoDesc.hpp>
 
 namespace avtranscoder
 {
diff --git a/src/AvTranscoder/DatasStructures/AudioDesc.cpp b/src/AvTranscoder/CodedStructures/AudioDesc.cpp
similarity index 89%
rename from src/AvTranscoder/DatasStructures/AudioDesc.cpp
rename to src/AvTranscoder/CodedStructures/AudioDesc.cpp
index 11d15e9b..55ee1e86 100644
--- a/src/AvTranscoder/DatasStructures/AudioDesc.cpp
+++ b/src/AvTranscoder/CodedStructures/AudioDesc.cpp
@@ -6,17 +6,17 @@ namespace avtranscoder
 {
 
 AudioDesc::AudioDesc( const std::string& codecName )
-	: EssenceDesc( codecName )
+	: CodedDesc( codecName )
 {
 }
 
 AudioDesc::AudioDesc( const AVCodecID codecId )
-	: EssenceDesc( codecId )
+	: CodedDesc( codecId )
 {
 }
 
-AudioDesc::AudioDesc( const EssenceDesc& essenceDesc )
-	: EssenceDesc( essenceDesc.getCodecId() )
+AudioDesc::AudioDesc( const CodedDesc& essenceDesc )
+	: CodedDesc( essenceDesc.getCodecId() )
 {
 	m_codec = essenceDesc.getCodec();
 	m_codecContext = essenceDesc.getCodecContext();
diff --git a/src/AvTranscoder/DatasStructures/AudioDesc.hpp b/src/AvTranscoder/CodedStructures/AudioDesc.hpp
similarity index 57%
rename from src/AvTranscoder/DatasStructures/AudioDesc.hpp
rename to src/AvTranscoder/CodedStructures/AudioDesc.hpp
index 7663f07e..280bfbdf 100644
--- a/src/AvTranscoder/DatasStructures/AudioDesc.hpp
+++ b/src/AvTranscoder/CodedStructures/AudioDesc.hpp
@@ -3,30 +3,22 @@
 
 #include <string>
 
-extern "C" {
-#ifndef __STDC_CONSTANT_MACROS
-	#define __STDC_CONSTANT_MACROS
-#endif
-#ifndef INT64_C
-	#define INT64_C(c) (c ## LL)
-	#define UINT64_C(c) (c ## ULL)
-#endif
-#include <libavcodec/avcodec.h>
-}
-
 #include <AvTranscoder/common.hpp>
-#include <AvTranscoder/DatasStructures/EssenceDesc.hpp>
-#include <AvTranscoder/DatasStructures/AudioFrame.hpp>
+#include <AvTranscoder/EssenceStructures/AudioFrame.hpp>
+
+#include "CodedDesc.hpp"
+
+class AVCodec;
 
 namespace avtranscoder
 {
 
-class AvExport AudioDesc : public EssenceDesc
+class AvExport AudioDesc : public CodedDesc
 {
 public:
 	AudioDesc( const std::string& codecName = "" );
 	AudioDesc( const AVCodecID codecId );
-	AudioDesc( const EssenceDesc& essenceDesc );
+	AudioDesc( const CodedDesc& essenceDesc );
 
 	AudioFrameDesc getFrameDesc() const;
 	const size_t getSampleRate() const;
diff --git a/src/AvTranscoder/DatasStructures/EssenceDesc.cpp b/src/AvTranscoder/CodedStructures/CodedDesc.cpp
similarity index 85%
rename from src/AvTranscoder/DatasStructures/EssenceDesc.cpp
rename to src/AvTranscoder/CodedStructures/CodedDesc.cpp
index c9851175..3b5fb8ce 100644
--- a/src/AvTranscoder/DatasStructures/EssenceDesc.cpp
+++ b/src/AvTranscoder/CodedStructures/CodedDesc.cpp
@@ -1,9 +1,10 @@
-#include "EssenceDesc.hpp"
+#include "CodedDesc.hpp"
 
 extern "C" {
 #ifndef __STDC_CONSTANT_MACROS
 	#define __STDC_CONSTANT_MACROS
 #endif
+#include <libavcodec/avcodec.h>
 #include <libavutil/opt.h>
 #include <libavutil/error.h>
 }
@@ -15,7 +16,7 @@ extern "C" {
 
 namespace avtranscoder {
 
-EssenceDesc::EssenceDesc( const std::string& codecName )
+CodedDesc::CodedDesc( const std::string& codecName )
 	: m_codec( NULL )
 	, m_codecContext( NULL )
 {
@@ -23,40 +24,40 @@ EssenceDesc::EssenceDesc( const std::string& codecName )
 		setCodec( codecName );
 }
 
-EssenceDesc::EssenceDesc( const AVCodecID codecId )
+CodedDesc::CodedDesc( const AVCodecID codecId )
 	: m_codec( NULL )
 	, m_codecContext( NULL )
 {
 	setCodec( codecId );
 }
 
-std::string EssenceDesc::getCodecName() const
+std::string CodedDesc::getCodecName() const
 {
 	assert( m_codecContext != NULL );
 	return avcodec_descriptor_get( m_codecContext->codec_id )->name;
 }
 
-AVCodecID EssenceDesc::getCodecId() const
+AVCodecID CodedDesc::getCodecId() const
 {
 	assert( m_codecContext != NULL );
 	return m_codecContext->codec_id;
 }
 
-void EssenceDesc::setCodec( const std::string& codecName )
+void CodedDesc::setCodec( const std::string& codecName )
 {
 	avcodec_register_all();  // Warning: should be called only once
 	m_codec = avcodec_find_encoder_by_name( codecName.c_str() );
 	initCodecContext();
 }
 
-void EssenceDesc::setCodec( const AVCodecID codecId )
+void CodedDesc::setCodec( const AVCodecID codecId )
 {
 	avcodec_register_all();  // Warning: should be called only once
 	m_codec = avcodec_find_encoder( codecId );
 	initCodecContext();
 }
 
-void EssenceDesc::initCodecContext( )
+void CodedDesc::initCodecContext( )
 {
 	if( m_codec == NULL )
 	{
@@ -75,7 +76,7 @@ void EssenceDesc::initCodecContext( )
 	}
 }
 
-void EssenceDesc::set( const std::string& key, const std::string& flag, const bool enable )
+void CodedDesc::set( const std::string& key, const std::string& flag, const bool enable )
 {
 	int error = 0;
 	int64_t optVal;
@@ -112,7 +113,7 @@ void EssenceDesc::set( const std::string& key, const std::string& flag, const bo
 	}
 }
 
-void EssenceDesc::set( const std::string& key, const bool value )
+void CodedDesc::set( const std::string& key, const bool value )
 {
 	int error = av_opt_set_int( m_codecContext, key.c_str(), value, AV_OPT_SEARCH_CHILDREN );
 	if( error != 0 )
@@ -124,7 +125,7 @@ void EssenceDesc::set( const std::string& key, const bool value )
 	}
 }
 
-void EssenceDesc::set( const std::string& key, const int value )
+void CodedDesc::set( const std::string& key, const int value )
 {
 	//const AVOption* flagOpt = av_opt_find( m_codecContext, key.c_str(), NULL, 0, AV_OPT_SEARCH_CHILDREN );
 
@@ -140,7 +141,7 @@ void EssenceDesc::set( const std::string& key, const int value )
 	}
 }
 
-void EssenceDesc::set( const std::string& key, const int num, const int den )
+void CodedDesc::set( const std::string& key, const int num, const int den )
 {
 	AVRational ratio;
 	ratio.num = num;
@@ -157,7 +158,7 @@ void EssenceDesc::set( const std::string& key, const int num, const int den )
 	}
 }
 
-void EssenceDesc::set( const std::string& key, const double value )
+void CodedDesc::set( const std::string& key, const double value )
 {
 	int error = av_opt_set_double( m_codecContext, key.c_str(), value, AV_OPT_SEARCH_CHILDREN );
 	if( error != 0 )
@@ -171,7 +172,7 @@ void EssenceDesc::set( const std::string& key, const double value )
 	}
 }
 
-void EssenceDesc::set( const std::string& key, const std::string& value )
+void CodedDesc::set( const std::string& key, const std::string& value )
 {
 	int error = av_opt_set( m_codecContext, key.c_str(), value.c_str(), AV_OPT_SEARCH_CHILDREN );
 	if( error != 0 )
diff --git a/src/AvTranscoder/DatasStructures/EssenceDesc.hpp b/src/AvTranscoder/CodedStructures/CodedDesc.hpp
similarity index 75%
rename from src/AvTranscoder/DatasStructures/EssenceDesc.hpp
rename to src/AvTranscoder/CodedStructures/CodedDesc.hpp
index c75c7588..09b9b76b 100644
--- a/src/AvTranscoder/DatasStructures/EssenceDesc.hpp
+++ b/src/AvTranscoder/CodedStructures/CodedDesc.hpp
@@ -3,29 +3,21 @@
 
 #include <string>
 
-extern "C" {
-#ifndef __STDC_CONSTANT_MACROS
-	#define __STDC_CONSTANT_MACROS
-#endif
-#ifndef INT64_C
-	#define INT64_C(c) (c ## LL)
-	#define UINT64_C(c) (c ## ULL)
-#endif
-#include <libavcodec/avcodec.h>
-}
-
 #include <AvTranscoder/common.hpp>
 
+class AVCodec;
+class AVCodecContext;
+
 namespace avtranscoder
 {
 
-class AvExport EssenceDesc
+class AvExport CodedDesc
 {
 public:
-	EssenceDesc( const std::string& codecName );
-	EssenceDesc( const AVCodecID codecId );
+	CodedDesc( const std::string& codecName );
+	CodedDesc( const AVCodecID codecId );
 	
-	virtual ~EssenceDesc() {}
+	virtual ~CodedDesc() {}
 	
 	std::string getCodecName()  const;
 	AVCodecID   getCodecId()  const;
diff --git a/src/AvTranscoder/DatasStructures/DataStreamDesc.hpp b/src/AvTranscoder/CodedStructures/DataStreamDesc.hpp
similarity index 73%
rename from src/AvTranscoder/DatasStructures/DataStreamDesc.hpp
rename to src/AvTranscoder/CodedStructures/DataStreamDesc.hpp
index 5fb165ad..89144ef8 100644
--- a/src/AvTranscoder/DatasStructures/DataStreamDesc.hpp
+++ b/src/AvTranscoder/CodedStructures/DataStreamDesc.hpp
@@ -1,19 +1,8 @@
 #ifndef _AV_TRANSCODER_DATA_DATA_STREAM_DESC_HPP_
 #define _AV_TRANSCODER_DATA_DATA_STREAM_DESC_HPP_
 
-#include <string>
 #include <vector>
-
-extern "C" {
-#ifndef __STDC_CONSTANT_MACROS
-	#define __STDC_CONSTANT_MACROS
-#endif
-#ifndef INT64_C
-	#define INT64_C(c) (c ## LL)
-	#define UINT64_C(c) (c ## ULL)
-#endif
-#include <libavcodec/avcodec.h>
-}
+#include <cstring>
 
 namespace avtranscoder
 {
diff --git a/src/AvTranscoder/DatasStructures/VideoDesc.cpp b/src/AvTranscoder/CodedStructures/VideoDesc.cpp
similarity index 65%
rename from src/AvTranscoder/DatasStructures/VideoDesc.cpp
rename to src/AvTranscoder/CodedStructures/VideoDesc.cpp
index 1060524c..1335b9d4 100644
--- a/src/AvTranscoder/DatasStructures/VideoDesc.cpp
+++ b/src/AvTranscoder/CodedStructures/VideoDesc.cpp
@@ -6,33 +6,33 @@ namespace avtranscoder
 {
 
 VideoDesc::VideoDesc( const std::string& codecName )
-	: EssenceDesc( codecName )
+	: CodedDesc( codecName )
 {
 }
 
 VideoDesc::VideoDesc( const AVCodecID codecId )
-	: EssenceDesc( codecId )
+	: CodedDesc( codecId )
 {
 }
 
-VideoDesc::VideoDesc( const EssenceDesc& essenceDesc )
-	: EssenceDesc( essenceDesc.getCodecId() )
+VideoDesc::VideoDesc( const CodedDesc& essenceDesc )
+	: CodedDesc( essenceDesc.getCodecId() )
 {
 	m_codec = essenceDesc.getCodec();
 	m_codecContext = essenceDesc.getCodecContext();
 }
 
-ImageDesc VideoDesc::getImageDesc() const
+VideoFrameDesc VideoDesc::getVideoFrameDesc() const
 {
 	assert( m_codecContext != NULL );
-	ImageDesc imageDesc;
+	VideoFrameDesc VideoFrameDesc;
 	Pixel pixel( m_codecContext->pix_fmt );
 
-	imageDesc.setWidth ( m_codecContext->width  );
-	imageDesc.setHeight( m_codecContext->height );
-	imageDesc.setPixel ( pixel );
-	imageDesc.setDar   ( m_codecContext->height, m_codecContext->width );
-	return imageDesc;
+	VideoFrameDesc.setWidth ( m_codecContext->width  );
+	VideoFrameDesc.setHeight( m_codecContext->height );
+	VideoFrameDesc.setPixel ( pixel );
+	VideoFrameDesc.setDar   ( m_codecContext->height, m_codecContext->width );
+	return VideoFrameDesc;
 }
 
 std::pair< size_t, size_t > VideoDesc::getTimeBase() const
@@ -44,9 +44,9 @@ std::pair< size_t, size_t > VideoDesc::getTimeBase() const
 	return timeBase;
 }
 
-void VideoDesc::setImageParameters( const ImageDesc& imageDesc )
+void VideoDesc::setImageParameters( const VideoFrameDesc& VideoFrameDesc )
 {
-	setImageParameters( imageDesc.getWidth(), imageDesc.getHeight(), imageDesc.getPixelDesc() );
+	setImageParameters( VideoFrameDesc.getWidth(), VideoFrameDesc.getHeight(), VideoFrameDesc.getPixelDesc() );
 }
 
 
diff --git a/src/AvTranscoder/DatasStructures/VideoDesc.hpp b/src/AvTranscoder/CodedStructures/VideoDesc.hpp
similarity index 55%
rename from src/AvTranscoder/DatasStructures/VideoDesc.hpp
rename to src/AvTranscoder/CodedStructures/VideoDesc.hpp
index fe52c492..b50da314 100644
--- a/src/AvTranscoder/DatasStructures/VideoDesc.hpp
+++ b/src/AvTranscoder/CodedStructures/VideoDesc.hpp
@@ -3,35 +3,27 @@
 
 #include <string>
 
-extern "C" {
-#ifndef __STDC_CONSTANT_MACROS
-	#define __STDC_CONSTANT_MACROS
-#endif
-#ifndef INT64_C
-	#define INT64_C(c) (c ## LL)
-	#define UINT64_C(c) (c ## ULL)
-#endif
-#include <libavcodec/avcodec.h>
-}
-
 #include <AvTranscoder/common.hpp>
-#include <AvTranscoder/DatasStructures/EssenceDesc.hpp>
-#include <AvTranscoder/DatasStructures/Image.hpp>
+#include <AvTranscoder/EssenceStructures/VideoFrame.hpp>
+
+#include "CodedDesc.hpp"
+
+class AVCodec;
 
 namespace avtranscoder
 {
 
-class AvExport VideoDesc : public EssenceDesc
+class AvExport VideoDesc : public CodedDesc
 {
 public:
 	VideoDesc( const std::string& codecName = "" );
 	VideoDesc( const AVCodecID codecId );
-	VideoDesc( const EssenceDesc& essenceDesc );
+	VideoDesc( const CodedDesc& essenceDesc );
 	
-	ImageDesc getImageDesc() const;
+	VideoFrameDesc getVideoFrameDesc() const;
 	std::pair< size_t, size_t > getTimeBase() const;
 	
-	void setImageParameters( const ImageDesc& imageDesc );
+	void setImageParameters( const VideoFrameDesc& VideoFrameDesc );
 	void setImageParameters( const size_t width, const size_t height, const Pixel& pixel );
 	void setImageParameters( const size_t width, const size_t height, const AVPixelFormat& pixel );
 
diff --git a/src/AvTranscoder/Description.hpp b/src/AvTranscoder/Description.hpp
index 68cea001..f2764eab 100644
--- a/src/AvTranscoder/Description.hpp
+++ b/src/AvTranscoder/Description.hpp
@@ -3,7 +3,6 @@
 
 #include <vector>
 #include <string>
-#include <map>
 
 #include "common.hpp"
 
diff --git a/src/AvTranscoder/EssenceStream/DummyAudio.cpp b/src/AvTranscoder/EssenceStream/DummyAudio.cpp
index 8df1edda..38abf75f 100644
--- a/src/AvTranscoder/EssenceStream/DummyAudio.cpp
+++ b/src/AvTranscoder/EssenceStream/DummyAudio.cpp
@@ -1,8 +1,5 @@
 #include "DummyAudio.hpp"
 
-#include <cassert>
-#include <cstring>
-
 namespace avtranscoder
 {
 
diff --git a/src/AvTranscoder/EssenceStream/DummyAudio.hpp b/src/AvTranscoder/EssenceStream/DummyAudio.hpp
index 9024f1a5..67f28797 100644
--- a/src/AvTranscoder/EssenceStream/DummyAudio.hpp
+++ b/src/AvTranscoder/EssenceStream/DummyAudio.hpp
@@ -3,8 +3,9 @@
 
 #include "InputEssence.hpp"
 
-#include <AvTranscoder/DatasStructures/AudioDesc.hpp>
-#include <AvTranscoder/DatasStructures/Frame.hpp>
+#include <AvTranscoder/common.hpp>
+#include <AvTranscoder/CodedStructures/AudioDesc.hpp>
+#include <AvTranscoder/EssenceStructures/Frame.hpp>
 
 namespace avtranscoder
 {
diff --git a/src/AvTranscoder/EssenceStream/DummyVideo.cpp b/src/AvTranscoder/EssenceStream/DummyVideo.cpp
index 0113dbcb..a50ec79c 100644
--- a/src/AvTranscoder/EssenceStream/DummyVideo.cpp
+++ b/src/AvTranscoder/EssenceStream/DummyVideo.cpp
@@ -1,8 +1,5 @@
 #include "DummyVideo.hpp"
 
-#include <cassert>
-#include <cstring>
-
 namespace avtranscoder
 {
 
@@ -20,7 +17,7 @@ DummyVideo::~DummyVideo( )
 void DummyVideo::setVideoDesc( const VideoDesc& videoDesc )
 {
 	_videoDesc = videoDesc;
-	_imageDesc = _videoDesc.getImageDesc();
+	_VideoFrameDesc = _videoDesc.getVideoFrameDesc();
 }
 
 VideoDesc DummyVideo::getVideoDesc() const
@@ -35,7 +32,7 @@ void DummyVideo::setFrame( Frame& inputFrame )
 
 bool DummyVideo::readNextFrame( Frame& frameBuffer )
 {
-	frameBuffer.getBuffer().resize( _imageDesc.getDataSize() );
+	frameBuffer.getBuffer().resize( _VideoFrameDesc.getDataSize() );
 
 	if( ! _inputFrame )
 	{
diff --git a/src/AvTranscoder/EssenceStream/DummyVideo.hpp b/src/AvTranscoder/EssenceStream/DummyVideo.hpp
index 5f123d01..85b86a30 100644
--- a/src/AvTranscoder/EssenceStream/DummyVideo.hpp
+++ b/src/AvTranscoder/EssenceStream/DummyVideo.hpp
@@ -3,8 +3,9 @@
 
 #include "InputEssence.hpp"
 
-#include <AvTranscoder/DatasStructures/VideoDesc.hpp>
-#include <AvTranscoder/DatasStructures/Frame.hpp>
+#include <AvTranscoder/common.hpp>
+#include <AvTranscoder/CodedStructures/VideoDesc.hpp>
+#include <AvTranscoder/EssenceStructures/Frame.hpp>
 
 namespace avtranscoder
 {
@@ -31,7 +32,7 @@ class AvExport DummyVideo : public InputEssence
 private:
 	Frame*    _inputFrame;
 	VideoDesc _videoDesc;
-	ImageDesc _imageDesc;
+	VideoFrameDesc _VideoFrameDesc;
 
 	size_t    _numberOfView;
 };
diff --git a/src/AvTranscoder/EssenceStream/InputAudio.cpp b/src/AvTranscoder/EssenceStream/InputAudio.cpp
index 1b7c3c6d..1343e0b4 100644
--- a/src/AvTranscoder/EssenceStream/InputAudio.cpp
+++ b/src/AvTranscoder/EssenceStream/InputAudio.cpp
@@ -12,6 +12,7 @@ extern "C" {
 }
 
 #include <AvTranscoder/CodedStream/AvInputStream.hpp>
+#include <AvTranscoder/EssenceStructures/AudioFrame.hpp>
 
 #include <iostream>
 #include <stdexcept>
diff --git a/src/AvTranscoder/EssenceStream/InputAudio.hpp b/src/AvTranscoder/EssenceStream/InputAudio.hpp
index c366a15d..d4abbb57 100644
--- a/src/AvTranscoder/EssenceStream/InputAudio.hpp
+++ b/src/AvTranscoder/EssenceStream/InputAudio.hpp
@@ -2,9 +2,7 @@
 #define _AV_TRANSCODER_ESSENCE_STREAM_INPUT_AUDIO_HPP_
 
 #include "InputEssence.hpp"
-#include <AvTranscoder/DatasStructures/AudioFrame.hpp>
 
-class AVFormatContext;
 class AVCodec;
 class AVCodecContext;
 class AVFrame;
diff --git a/src/AvTranscoder/EssenceStream/InputEssence.hpp b/src/AvTranscoder/EssenceStream/InputEssence.hpp
index 0284f3be..fe85d2c9 100644
--- a/src/AvTranscoder/EssenceStream/InputEssence.hpp
+++ b/src/AvTranscoder/EssenceStream/InputEssence.hpp
@@ -2,7 +2,7 @@
 #define _AV_TRANSCODER_ESSENCE_STREAM_INPUT_ESSENCE_HPP_
 
 #include <AvTranscoder/common.hpp>
-#include <AvTranscoder/DatasStructures/Frame.hpp>
+#include <AvTranscoder/EssenceStructures/Frame.hpp>
 
 namespace avtranscoder
 {
diff --git a/src/AvTranscoder/EssenceStream/InputVideo.cpp b/src/AvTranscoder/EssenceStream/InputVideo.cpp
index 6fe15edd..582cfc32 100644
--- a/src/AvTranscoder/EssenceStream/InputVideo.cpp
+++ b/src/AvTranscoder/EssenceStream/InputVideo.cpp
@@ -11,8 +11,8 @@ extern "C" {
 }
 
 #include <AvTranscoder/CodedStream/AvInputStream.hpp>
+#include <AvTranscoder/EssenceStructures/VideoFrame.hpp>
 
-#include <iostream>
 #include <stdexcept>
 
 namespace avtranscoder
@@ -124,7 +124,7 @@ bool InputVideo::readNextFrame( Frame& frameBuffer )
 		av_free_packet( &packet );
 	}
 
-	Image& imageBuffer = static_cast<Image&>( frameBuffer );
+	VideoFrame& imageBuffer = static_cast<VideoFrame&>( frameBuffer );
 
 	size_t decodedSize = avpicture_get_size( (AVPixelFormat)_frame->format, _frame->width, _frame->height );
 	if( imageBuffer.getBuffer().size() != decodedSize )
diff --git a/src/AvTranscoder/EssenceStream/InputVideo.hpp b/src/AvTranscoder/EssenceStream/InputVideo.hpp
index 92b5c896..6871a497 100644
--- a/src/AvTranscoder/EssenceStream/InputVideo.hpp
+++ b/src/AvTranscoder/EssenceStream/InputVideo.hpp
@@ -2,11 +2,7 @@
 #define _AV_TRANSCODER_ESSENCE_STREAM_INPUT_VIDEO_HPP_
 
 #include "InputEssence.hpp"
-#include <AvTranscoder/DatasStructures/Image.hpp>
 
-#include <vector>
-
-class AVFormatContext;
 class AVCodec;
 class AVCodecContext;
 class AVFrame;
diff --git a/src/AvTranscoder/EssenceStream/OutputAudio.cpp b/src/AvTranscoder/EssenceStream/OutputAudio.cpp
index bcc3a726..41ce5f72 100644
--- a/src/AvTranscoder/EssenceStream/OutputAudio.cpp
+++ b/src/AvTranscoder/EssenceStream/OutputAudio.cpp
@@ -9,9 +9,7 @@ extern "C" {
 #include <libavutil/avutil.h>
 }
 
-#include <AvTranscoder/DatasStructures/AudioFrame.hpp>
-#include <AvTranscoder/Profile.hpp>
-
+#include <iostream>
 #include <stdexcept>
 #include <cstdlib>
 
diff --git a/src/AvTranscoder/EssenceStream/OutputAudio.hpp b/src/AvTranscoder/EssenceStream/OutputAudio.hpp
index 4b3a4369..541e4c88 100644
--- a/src/AvTranscoder/EssenceStream/OutputAudio.hpp
+++ b/src/AvTranscoder/EssenceStream/OutputAudio.hpp
@@ -3,9 +3,9 @@
 
 #include "OutputEssence.hpp"
 
-#include <AvTranscoder/DatasStructures/AudioDesc.hpp>
-#include <AvTranscoder/DatasStructures/DataStreamDesc.hpp>
-#include <AvTranscoder/DatasStructures/AudioFrame.hpp>
+#include <AvTranscoder/CodedStructures/DataStreamDesc.hpp>
+#include <AvTranscoder/CodedStructures/AudioDesc.hpp>
+#include <AvTranscoder/EssenceStructures/AudioFrame.hpp>
 
 #include <AvTranscoder/Profile.hpp>
 
diff --git a/src/AvTranscoder/EssenceStream/OutputEssence.hpp b/src/AvTranscoder/EssenceStream/OutputEssence.hpp
index b4931878..c06a0e64 100644
--- a/src/AvTranscoder/EssenceStream/OutputEssence.hpp
+++ b/src/AvTranscoder/EssenceStream/OutputEssence.hpp
@@ -1,20 +1,8 @@
 #ifndef _AV_TRANSCODER_ESSENCE_STREAM_OUTPUT_ESSENCE_HPP_
 #define _AV_TRANSCODER_ESSENCE_STREAM_OUTPUT_ESSENCE_HPP_
 
-extern "C" {
-#ifndef __STDC_CONSTANT_MACROS
-    #define __STDC_CONSTANT_MACROS
-#endif
-#include <libavutil/pixfmt.h>
-}
-
-#include <string>
-#include <vector>
-
-#include <AvTranscoder/DatasStructures/Frame.hpp>
-#include <AvTranscoder/DatasStructures/DataStreamDesc.hpp>
-
-#include <AvTranscoder/Profile.hpp>
+#include <AvTranscoder/EssenceStructures/Frame.hpp>
+#include <AvTranscoder/CodedStructures/DataStreamDesc.hpp>
 
 namespace avtranscoder
 {
diff --git a/src/AvTranscoder/EssenceStream/OutputVideo.cpp b/src/AvTranscoder/EssenceStream/OutputVideo.cpp
index 5817408e..80bf4ceb 100644
--- a/src/AvTranscoder/EssenceStream/OutputVideo.cpp
+++ b/src/AvTranscoder/EssenceStream/OutputVideo.cpp
@@ -7,14 +7,9 @@ extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
 #include <libavutil/avutil.h>
-#include <libavutil/pixdesc.h>
-#include <libavutil/imgutils.h>
-#include <libavutil/mathematics.h>
 }
 
-#include <AvTranscoder/DatasStructures/Image.hpp>
-#include <AvTranscoder/Profile.hpp>
-
+#include <iostream>
 #include <stdexcept>
 #include <cstdlib>
 
@@ -68,7 +63,7 @@ bool OutputVideo::encodeFrame( const Frame& sourceFrame, DataStream& codedFrame
 	avcodec_get_frame_defaults( frame );
 #endif
 
-	const Image& sourceImageFrame = static_cast<const Image&>( sourceFrame );
+	const VideoFrame& sourceImageFrame = static_cast<const VideoFrame&>( sourceFrame );
 
 	frame->width  = codecContext->width;
 	frame->height = codecContext->height;
@@ -186,7 +181,7 @@ bool OutputVideo::encodeFrame( DataStream& codedFrame )
 #endif
 }
 
-void OutputVideo::setProfile( const Profile::ProfileDesc& desc, const avtranscoder::ImageDesc& imageDesc )
+void OutputVideo::setProfile( const Profile::ProfileDesc& desc, const avtranscoder::VideoFrameDesc& VideoFrameDesc )
 {
 	if( ! desc.count( Profile::avProfileCodec ) ||
 		! desc.count( Profile::avProfilePixelFormat ) || 
@@ -200,7 +195,7 @@ void OutputVideo::setProfile( const Profile::ProfileDesc& desc, const avtranscod
 	const size_t frameRate = std::strtoul( desc.find( Profile::avProfileFrameRate )->second.c_str(), NULL, 0 );
 	_videoDesc.setTimeBase( 1, frameRate );
 	
-	_videoDesc.setImageParameters( imageDesc );
+	_videoDesc.setImageParameters( VideoFrameDesc );
 
 	for( Profile::ProfileDesc::const_iterator it = desc.begin(); it != desc.end(); ++it )
 	{
diff --git a/src/AvTranscoder/EssenceStream/OutputVideo.hpp b/src/AvTranscoder/EssenceStream/OutputVideo.hpp
index c40add0c..5334501b 100644
--- a/src/AvTranscoder/EssenceStream/OutputVideo.hpp
+++ b/src/AvTranscoder/EssenceStream/OutputVideo.hpp
@@ -1,27 +1,14 @@
 #ifndef _AV_TRANSCODER_ESSENCE_STREAM_OUTPUT_VIDEO_HPP_
 #define _AV_TRANSCODER_ESSENCE_STREAM_OUTPUT_VIDEO_HPP_
 
-extern "C" {
-#ifndef __STDC_CONSTANT_MACROS
-    #define __STDC_CONSTANT_MACROS
-#endif
-#include <libavutil/pixfmt.h>
-}
-
 #include "OutputEssence.hpp"
 
-#include <AvTranscoder/DatasStructures/VideoDesc.hpp>
-#include <AvTranscoder/DatasStructures/DataStreamDesc.hpp>
-#include <AvTranscoder/DatasStructures/Image.hpp>
+#include <AvTranscoder/CodedStructures/DataStreamDesc.hpp>
+#include <AvTranscoder/CodedStructures/VideoDesc.hpp>
+#include <AvTranscoder/EssenceStructures/VideoFrame.hpp>
 
 #include <AvTranscoder/Profile.hpp>
 
-#include <string>
-#include <vector>
-
-class AVFormatContext;
-class AVCodecContext;
-
 namespace avtranscoder
 {
 
@@ -44,7 +31,7 @@ class AvExport OutputVideo : public OutputEssence
 	 */
 	bool encodeFrame( DataStream& codedFrame );
 
-	void setProfile( const Profile::ProfileDesc& desc, const avtranscoder::ImageDesc& imageDesc );
+	void setProfile( const Profile::ProfileDesc& desc, const avtranscoder::VideoFrameDesc& VideoFrameDesc );
 	
 	VideoDesc& getVideoDesc() { return _videoDesc; }
 
diff --git a/src/AvTranscoder/DatasStructures/AudioFrame.hpp b/src/AvTranscoder/EssenceStructures/AudioFrame.hpp
similarity index 84%
rename from src/AvTranscoder/DatasStructures/AudioFrame.hpp
rename to src/AvTranscoder/EssenceStructures/AudioFrame.hpp
index 4ecb305d..34b034ab 100644
--- a/src/AvTranscoder/DatasStructures/AudioFrame.hpp
+++ b/src/AvTranscoder/EssenceStructures/AudioFrame.hpp
@@ -3,23 +3,6 @@
 
 #include <AvTranscoder/common.hpp>
 
-extern "C" {
-#ifndef __STDC_CONSTANT_MACROS
-	#define __STDC_CONSTANT_MACROS
-#endif
-#ifndef INT64_C
-	#define INT64_C(c) (c ## LL)
-	#define UINT64_C(c) (c ## ULL)
-#endif
-#include <libavcodec/avcodec.h>
-}
-
-#include <iostream>
-#include <string>
-#include <vector>
-#include <stdexcept>
-
-//#include "Sample.hpp"
 #include "Frame.hpp"
 
 namespace avtranscoder
diff --git a/src/AvTranscoder/DatasStructures/Frame.hpp b/src/AvTranscoder/EssenceStructures/Frame.hpp
similarity index 97%
rename from src/AvTranscoder/DatasStructures/Frame.hpp
rename to src/AvTranscoder/EssenceStructures/Frame.hpp
index bf0cdd84..d133574d 100644
--- a/src/AvTranscoder/DatasStructures/Frame.hpp
+++ b/src/AvTranscoder/EssenceStructures/Frame.hpp
@@ -3,7 +3,6 @@
 
 #include <AvTranscoder/common.hpp>
 
-#include <string>
 #include <vector>
 
 namespace avtranscoder
diff --git a/src/AvTranscoder/DatasStructures/Pixel.cpp b/src/AvTranscoder/EssenceStructures/Pixel.cpp
similarity index 99%
rename from src/AvTranscoder/DatasStructures/Pixel.cpp
rename to src/AvTranscoder/EssenceStructures/Pixel.cpp
index 5105c9cf..8fcceade 100644
--- a/src/AvTranscoder/DatasStructures/Pixel.cpp
+++ b/src/AvTranscoder/EssenceStructures/Pixel.cpp
@@ -5,7 +5,6 @@ extern "C" {
 	#define __STDC_CONSTANT_MACROS
 #endif
 #include <libavformat/avformat.h>
-#include <libavutil/pixfmt.h>
 #include <libswscale/swscale.h>
 #include <libavutil/imgutils.h>
 #include <libavutil/pixdesc.h>
diff --git a/src/AvTranscoder/DatasStructures/Pixel.hpp b/src/AvTranscoder/EssenceStructures/Pixel.hpp
similarity index 100%
rename from src/AvTranscoder/DatasStructures/Pixel.hpp
rename to src/AvTranscoder/EssenceStructures/Pixel.hpp
diff --git a/src/AvTranscoder/DatasStructures/Image.hpp b/src/AvTranscoder/EssenceStructures/VideoFrame.hpp
similarity index 85%
rename from src/AvTranscoder/DatasStructures/Image.hpp
rename to src/AvTranscoder/EssenceStructures/VideoFrame.hpp
index fa975772..f7e8c2f5 100644
--- a/src/AvTranscoder/DatasStructures/Image.hpp
+++ b/src/AvTranscoder/EssenceStructures/VideoFrame.hpp
@@ -11,12 +11,9 @@ extern "C" {
 	#define INT64_C(c) (c ## LL)
 	#define UINT64_C(c) (c ## ULL)
 #endif
-#include <libavcodec/avcodec.h>
+#include <libavutil/pixdesc.h>
 }
 
-#include <iostream>
-#include <string>
-#include <vector>
 #include <stdexcept>
 
 #include "Pixel.hpp"
@@ -33,7 +30,7 @@ namespace avtranscoder
 // 	//EColorRange     eColorRange;
 // };
 
-class AvExport ImageDesc
+class AvExport VideoFrameDesc
 {
 public:
 	void setWidth ( const size_t width     ) { m_width = width; }
@@ -75,25 +72,25 @@ class AvExport ImageDesc
 
 //template< template<typename> Alloc >
 //class AvExport ImageBase
-class AvExport Image : public Frame
+class AvExport VideoFrame : public Frame
 {
 public:
-	Image( const ImageDesc& ref )
-		: m_imageDesc( ref )
+	VideoFrame( const VideoFrameDesc& ref )
+		: m_videoFrameDesc( ref )
 	{
 		m_dataBuffer = DataBuffer( ref.getDataSize(), 0 );
 	}
 
-	virtual ~Image()
+	virtual ~VideoFrame()
 	{};
 
-	const ImageDesc&     desc() const    { return m_imageDesc; }
+	const VideoFrameDesc&     desc() const    { return m_videoFrameDesc; }
 
 private:
-	const ImageDesc m_imageDesc;
+	const VideoFrameDesc m_videoFrameDesc;
 };
 
-//typedef ImageBase<std::allocator> Image;
+//typedef ImageBase<std::allocator> VideoFrame;
 
 }
 
diff --git a/src/AvTranscoder/EssenceTransform/AudioEssenceTransform.cpp b/src/AvTranscoder/EssenceTransform/AudioEssenceTransform.cpp
index 793c475d..89a124a2 100644
--- a/src/AvTranscoder/EssenceTransform/AudioEssenceTransform.cpp
+++ b/src/AvTranscoder/EssenceTransform/AudioEssenceTransform.cpp
@@ -1,6 +1,6 @@
 #include "AudioEssenceTransform.hpp"
-#include <AvTranscoder/DatasStructures/AudioFrame.hpp>
-#include <AvTranscoder/common.hpp>
+
+#include <stdexcept>
 
 extern "C" {
 #ifndef __STDC_CONSTANT_MACROS
@@ -28,7 +28,7 @@ extern "C" {
 #endif
 }
 
-#include <stdexcept>
+#include <AvTranscoder/EssenceStructures/AudioFrame.hpp>
 
 namespace avtranscoder
 {
diff --git a/src/AvTranscoder/EssenceTransform/AudioEssenceTransform.hpp b/src/AvTranscoder/EssenceTransform/AudioEssenceTransform.hpp
index ad83b31c..e77392c1 100644
--- a/src/AvTranscoder/EssenceTransform/AudioEssenceTransform.hpp
+++ b/src/AvTranscoder/EssenceTransform/AudioEssenceTransform.hpp
@@ -1,9 +1,11 @@
 #ifndef _AV_TRANSCODER_ESSENCE_TRANSFORM_AUDIO_ESSENCE_TRANSFORM_HPP
 #define _AV_TRANSCODER_ESSENCE_TRANSFORM_AUDIO_ESSENCE_TRANSFORM_HPP
 
-#include <AvTranscoder/DatasStructures/Frame.hpp>
 #include "EssenceTransform.hpp"
 
+#include <AvTranscoder/common.hpp>
+#include <AvTranscoder/EssenceStructures/Frame.hpp>
+
 #ifdef AV_RESAMPLE_LIBRARY
  #define ResampleContext AVAudioResampleContext
 #else
diff --git a/src/AvTranscoder/EssenceTransform/EssenceTransform.hpp b/src/AvTranscoder/EssenceTransform/EssenceTransform.hpp
index 4acc3556..8f852b1a 100644
--- a/src/AvTranscoder/EssenceTransform/EssenceTransform.hpp
+++ b/src/AvTranscoder/EssenceTransform/EssenceTransform.hpp
@@ -1,7 +1,8 @@
 #ifndef _AV_TRANSCODER_ESSENCE_TRANSFORM_ESSENCE_TRANSFORM_HPP_
 #define _AV_TRANSCODER_ESSENCE_TRANSFORM_ESSENCE_TRANSFORM_HPP_
 
-#include <AvTranscoder/DatasStructures/Frame.hpp>
+#include <AvTranscoder/common.hpp>
+#include <AvTranscoder/EssenceStructures/Frame.hpp>
 
 namespace avtranscoder
 {
diff --git a/src/AvTranscoder/EssenceTransform/VideoEssenceTransform.cpp b/src/AvTranscoder/EssenceTransform/VideoEssenceTransform.cpp
index d662b350..6e23bf3f 100644
--- a/src/AvTranscoder/EssenceTransform/VideoEssenceTransform.cpp
+++ b/src/AvTranscoder/EssenceTransform/VideoEssenceTransform.cpp
@@ -1,4 +1,7 @@
 #include "VideoEssenceTransform.hpp"
+
+#include <AvTranscoder/EssenceStructures/Pixel.hpp>
+#include <AvTranscoder/EssenceStructures/VideoFrame.hpp>
 #include <AvTranscoder/common.hpp>
 
 extern "C" {
@@ -14,9 +17,6 @@ extern "C" {
 #endif
 }
 
-#include <AvTranscoder/DatasStructures/Pixel.hpp>
-#include <AvTranscoder/DatasStructures/Image.hpp>
-
 #include <iostream>
 #include <iomanip>
 #include <cassert>
@@ -39,8 +39,8 @@ VideoEssenceTransform::VideoEssenceTransform()
 
 bool VideoEssenceTransform::init( const Frame& srcFrame, const Frame& dstFrame )
 {
-	const Image& src = static_cast<const Image&>( srcFrame );
-	const Image& dst = static_cast<const Image&>( dstFrame );
+	const VideoFrame& src = static_cast<const VideoFrame&>( srcFrame );
+	const VideoFrame& dst = static_cast<const VideoFrame&>( dstFrame );
 
 	assert( src.desc().getWidth()  != 0 );
 	assert( src.desc().getHeight() != 0 );
@@ -84,8 +84,8 @@ bool VideoEssenceTransform::init( const Frame& srcFrame, const Frame& dstFrame )
 
 void VideoEssenceTransform::convert( const Frame& srcFrame, Frame& dstFrame )
 {
-	const Image& src = static_cast<const Image&>( srcFrame );
-	Image& dst = static_cast<Image&>( dstFrame );
+	const VideoFrame& src = static_cast<const VideoFrame&>( srcFrame );
+	VideoFrame& dst = static_cast<VideoFrame&>( dstFrame );
 
 	assert( src.desc().getWidth()  != 0 );
 	assert( src.desc().getHeight() != 0 );
diff --git a/src/AvTranscoder/EssenceTransform/VideoEssenceTransform.hpp b/src/AvTranscoder/EssenceTransform/VideoEssenceTransform.hpp
index 4606ce7f..d56ab161 100644
--- a/src/AvTranscoder/EssenceTransform/VideoEssenceTransform.hpp
+++ b/src/AvTranscoder/EssenceTransform/VideoEssenceTransform.hpp
@@ -1,10 +1,11 @@
 #ifndef _AV_TRANSCODER_ESSENCE_TRANSFORM_VIDEO_ESSENCE_TRANSFORM_HPP
 #define _AV_TRANSCODER_ESSENCE_TRANSFORM_VIDEO_ESSENCE_TRANSFORM_HPP
 
-#include <AvTranscoder/DatasStructures/Frame.hpp>
+#include <vector>
+
 #include "EssenceTransform.hpp"
 
-#include <vector>
+#include <AvTranscoder/EssenceStructures/Frame.hpp>
 
 class SwsContext;
 
diff --git a/src/AvTranscoder/File/InputFile.cpp b/src/AvTranscoder/File/InputFile.cpp
index 60f8f9a9..ea5a9887 100644
--- a/src/AvTranscoder/File/InputFile.cpp
+++ b/src/AvTranscoder/File/InputFile.cpp
@@ -16,10 +16,8 @@ extern "C" {
 #include <libavformat/avformat.h>
 #include <libavutil/avutil.h>
 #include <libavutil/pixdesc.h>
-#include <libavutil/avstring.h>
 }
 
-#include <iostream>
 #include <stdexcept>
 #include <cassert>
 
@@ -124,7 +122,6 @@ InputFile& InputFile::analyse( ProgressListener& progress, const EAnalyseLevel l
 			}
 			case AVMEDIA_TYPE_NB:
 			{
-				// std::cout << "NB" << std::endl;
 				break;
 			}
 		}
diff --git a/src/AvTranscoder/File/InputFile.hpp b/src/AvTranscoder/File/InputFile.hpp
index 01e39102..b44e0e40 100644
--- a/src/AvTranscoder/File/InputFile.hpp
+++ b/src/AvTranscoder/File/InputFile.hpp
@@ -1,21 +1,21 @@
 #ifndef _AV_TRANSCODER_FILE_INPUT_FILE_HPP_
 #define _AV_TRANSCODER_FILE_INPUT_FILE_HPP_
 
-#include <AvTranscoder/DatasStructures/DataStreamDesc.hpp>
-#include <AvTranscoder/DatasStructures/AudioDesc.hpp>
-#include <AvTranscoder/DatasStructures/VideoDesc.hpp>
+#include <AvTranscoder/common.hpp>
+
+#include <AvTranscoder/CodedStructures/DataStreamDesc.hpp>
+#include <AvTranscoder/CodedStructures/AudioDesc.hpp>
+#include <AvTranscoder/CodedStructures/VideoDesc.hpp>
+
 #include <AvTranscoder/CodedStream/AvInputStream.hpp>
+
 #include <AvTranscoder/Metadatas/MediaMetadatasStructures.hpp>
 #include <AvTranscoder/ProgressListener.hpp>
 
 #include <string>
 #include <vector>
 
-class AVInputFormat;
 class AVFormatContext;
-class AVStream;
-class AVCodec;
-class AVCodecContext;
 
 namespace avtranscoder
 {
diff --git a/src/AvTranscoder/File/OutputFile.cpp b/src/AvTranscoder/File/OutputFile.cpp
index cfa4a317..5ddefff2 100644
--- a/src/AvTranscoder/File/OutputFile.cpp
+++ b/src/AvTranscoder/File/OutputFile.cpp
@@ -8,7 +8,6 @@ extern "C" {
 #include <libavformat/avformat.h>
 #include <libavutil/avutil.h>
 #include <libavutil/pixdesc.h>
-#include <libavutil/avstring.h>
 }
 
 #include <iostream>
diff --git a/src/AvTranscoder/File/OutputFile.hpp b/src/AvTranscoder/File/OutputFile.hpp
index 65540dff..e0e07579 100644
--- a/src/AvTranscoder/File/OutputFile.hpp
+++ b/src/AvTranscoder/File/OutputFile.hpp
@@ -1,21 +1,22 @@
 #ifndef _AV_TRANSCODER_FILE_OUTPUT_FILE_HPP_
 #define _AV_TRANSCODER_FILE_OUTPUT_FILE_HPP_
 
-#include <AvTranscoder/DatasStructures/Image.hpp>
-#include <AvTranscoder/DatasStructures/DataStreamDesc.hpp>
-#include <AvTranscoder/DatasStructures/VideoDesc.hpp>
-#include <AvTranscoder/DatasStructures/AudioDesc.hpp>
-#include <AvTranscoder/CodedStream/AvOutputStream.hpp>
+#include <AvTranscoder/common.hpp>
+
+#include <AvTranscoder/CodedStructures/DataStreamDesc.hpp>
+#include <AvTranscoder/CodedStructures/VideoDesc.hpp>
+#include <AvTranscoder/CodedStructures/AudioDesc.hpp>
 
+#include <AvTranscoder/CodedStream/AvOutputStream.hpp>
 
 #include <string>
 #include <vector>
 
 class AVOutputFormat;
 class AVFormatContext;
-class AVStream;
 class AVCodec;
 class AVCodecContext;
+class AVStream;
 
 namespace avtranscoder
 {
diff --git a/src/AvTranscoder/Metadatas/AttachementStreamProperties.hpp b/src/AvTranscoder/Metadatas/AttachementStreamProperties.hpp
index af3dfee0..2e3f7e2c 100644
--- a/src/AvTranscoder/Metadatas/AttachementStreamProperties.hpp
+++ b/src/AvTranscoder/Metadatas/AttachementStreamProperties.hpp
@@ -1,15 +1,7 @@
 #ifndef _AV_TRANSCODER_ATTACHEMENT_STREAM_PROPERTIES_HPP_
 #define _AV_TRANSCODER_ATTACHEMENT_STREAM_PROPERTIES_HPP_
 
-extern "C" {
-#ifndef __STDC_CONSTANT_MACROS
-	#define __STDC_CONSTANT_MACROS
-#endif
-#include <libavcodec/avcodec.h>
-#include <libavformat/avformat.h>
-#include <libavutil/avutil.h>
-#include <libavutil/pixdesc.h>
-}
+class AVFormatContext;
 
 namespace avtranscoder
 {
diff --git a/src/AvTranscoder/Metadatas/MediaMetadatasStructures.hpp b/src/AvTranscoder/Metadatas/MediaMetadatasStructures.hpp
index 80f2ae40..95c22fa8 100644
--- a/src/AvTranscoder/Metadatas/MediaMetadatasStructures.hpp
+++ b/src/AvTranscoder/Metadatas/MediaMetadatasStructures.hpp
@@ -1,12 +1,9 @@
 #ifndef _AV_TRANSCODER_MEDIA_HPP_
 #define _AV_TRANSCODER_MEDIA_HPP_
 
-#include <AvTranscoder/common.hpp>
-
 #include <string>
 #include <vector>
 
-class AVFormatContext;
 
 namespace avtranscoder
 {
diff --git a/src/AvTranscoder/Metadatas/SubtitleStreamProperties.hpp b/src/AvTranscoder/Metadatas/SubtitleStreamProperties.hpp
index 470d12ea..49aca6a1 100644
--- a/src/AvTranscoder/Metadatas/SubtitleStreamProperties.hpp
+++ b/src/AvTranscoder/Metadatas/SubtitleStreamProperties.hpp
@@ -1,15 +1,7 @@
 #ifndef _AV_TRANSCODER_SUBTITLE_STREAM_PROPERTIES_HPP_
 #define _AV_TRANSCODER_SUBTITLE_STREAM_PROPERTIES_HPP_
 
-extern "C" {
-#ifndef __STDC_CONSTANT_MACROS
-	#define __STDC_CONSTANT_MACROS
-#endif
-#include <libavcodec/avcodec.h>
-#include <libavformat/avformat.h>
-#include <libavutil/avutil.h>
-#include <libavutil/pixdesc.h>
-}
+class AVFormatContext;
 
 namespace avtranscoder
 {
diff --git a/src/AvTranscoder/Metadatas/UnknownStreamProperties.hpp b/src/AvTranscoder/Metadatas/UnknownStreamProperties.hpp
index 523b743f..a6fc9aee 100644
--- a/src/AvTranscoder/Metadatas/UnknownStreamProperties.hpp
+++ b/src/AvTranscoder/Metadatas/UnknownStreamProperties.hpp
@@ -1,15 +1,7 @@
 #ifndef _AV_TRANSCODER_UNKNOWN_STREAM_PROPERTIES_HPP_
 #define _AV_TRANSCODER_UNKNOWN_STREAM_PROPERTIES_HPP_
 
-extern "C" {
-#ifndef __STDC_CONSTANT_MACROS
-	#define __STDC_CONSTANT_MACROS
-#endif
-#include <libavcodec/avcodec.h>
-#include <libavformat/avformat.h>
-#include <libavutil/avutil.h>
-#include <libavutil/pixdesc.h>
-}
+class AVFormatContext;
 
 namespace avtranscoder
 {
diff --git a/src/AvTranscoder/Option.hpp b/src/AvTranscoder/Option.hpp
index e933db44..8afbf653 100644
--- a/src/AvTranscoder/Option.hpp
+++ b/src/AvTranscoder/Option.hpp
@@ -10,7 +10,7 @@ extern "C" {
 
 #include <vector>
 #include <string>
-#include <utility> //pair
+#include <utility>
 
 namespace avtranscoder
 {
diff --git a/src/AvTranscoder/OptionLoader.cpp b/src/AvTranscoder/OptionLoader.cpp
index 0f8d2337..a388a25d 100644
--- a/src/AvTranscoder/OptionLoader.cpp
+++ b/src/AvTranscoder/OptionLoader.cpp
@@ -4,6 +4,8 @@ extern "C" {
 #ifndef __STDC_CONSTANT_MACROS
 	#define __STDC_CONSTANT_MACROS
 #endif
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
 #include <libavutil/opt.h>
 #include <libavutil/pixfmt.h>
 #include <libavutil/pixdesc.h>
diff --git a/src/AvTranscoder/OptionLoader.hpp b/src/AvTranscoder/OptionLoader.hpp
index 7c1b0803..8cf448b8 100644
--- a/src/AvTranscoder/OptionLoader.hpp
+++ b/src/AvTranscoder/OptionLoader.hpp
@@ -1,21 +1,20 @@
 #ifndef _AV_TRANSCODER_OPTION_LOADER_HPP
 #define	_AV_TRANSCODER_OPTION_LOADER_HPP
 
-#include <AvTranscoder/Option.hpp>
-
-extern "C" {
-#ifndef __STDC_CONSTANT_MACROS
-	#define __STDC_CONSTANT_MACROS
-#endif
-	#include <libavcodec/avcodec.h>
-	#include <libavformat/avformat.h>
-}
 
 #include <string>
 #include <vector>
 #include <map>
 #include <utility> //pair
 
+#include "common.hpp"
+#include "Option.hpp"
+
+class AVFormatContext;
+class AVCodecContext;
+class AVOutputFormat;
+class AVCodec;
+
 namespace avtranscoder
 {
 
diff --git a/src/AvTranscoder/Profile.cpp b/src/AvTranscoder/Profile.cpp
index feef878d..734401e9 100644
--- a/src/AvTranscoder/Profile.cpp
+++ b/src/AvTranscoder/Profile.cpp
@@ -1,6 +1,6 @@
 #include "Profile.hpp"
 
-#include <AvTranscoder/common.hpp>
+#include "common.hpp"
 
 #include <AvTranscoder/Profiles/XdCamHd422.hpp>
 #include <AvTranscoder/Profiles/DNxHD.hpp>
diff --git a/src/AvTranscoder/Transcoder/StreamTranscoder.cpp b/src/AvTranscoder/Transcoder/StreamTranscoder.cpp
index 34c6d70a..4a653e8b 100644
--- a/src/AvTranscoder/Transcoder/StreamTranscoder.cpp
+++ b/src/AvTranscoder/Transcoder/StreamTranscoder.cpp
@@ -3,6 +3,10 @@
 
 #include <AvTranscoder/CodedStream/AvInputStream.hpp>
 
+#include <AvTranscoder/EssenceStream/InputVideo.hpp>
+#include <AvTranscoder/EssenceStream/InputAudio.hpp>
+#include <AvTranscoder/EssenceStream/OutputVideo.hpp>
+#include <AvTranscoder/EssenceStream/OutputAudio.hpp>
 #include <AvTranscoder/EssenceStream/DummyVideo.hpp>
 #include <AvTranscoder/EssenceStream/DummyAudio.hpp>
 
@@ -10,6 +14,7 @@
 #include <AvTranscoder/EssenceTransform/VideoEssenceTransform.hpp>
 
 #include <cassert>
+#include <iostream>
 
 namespace avtranscoder
 {
@@ -76,19 +81,19 @@ StreamTranscoder::StreamTranscoder(
 
 			_outputEssence = outputVideo;
 
-			ImageDesc outputImageDesc = _inputStream->getVideoDesc().getImageDesc();
+			VideoFrameDesc outputVideoFrameDesc = _inputStream->getVideoDesc().getVideoFrameDesc();
 
-			outputImageDesc.setPixel( Pixel( profile.find( Profile::avProfilePixelFormat )->second.c_str() ) );
+			outputVideoFrameDesc.setPixel( Pixel( profile.find( Profile::avProfilePixelFormat )->second.c_str() ) );
 
-			outputVideo->setProfile( profile, outputImageDesc );
+			outputVideo->setProfile( profile, outputVideoFrameDesc );
 			
 			_outputStream = &outputFile.addVideoStream( outputVideo->getVideoDesc() );
 
-			_sourceBuffer = new Image( _inputStream->getVideoDesc().getImageDesc() );
+			_sourceBuffer = new VideoFrame( _inputStream->getVideoDesc().getVideoFrameDesc() );
 
-			// outputVideo->getVideoDesc().setImageParameters( _inputStream->getVideoDesc().getImageDesc().getWidth(), _inputStream->getVideoDesc().getImageDesc().getHeight(), av_get_pix_fmt( desc[ Profile::avProfilePixelFormat ].c_str() ) );
+			// outputVideo->getVideoDesc().setImageParameters( _inputStream->getVideoDesc().getVideoFrameDesc().getWidth(), _inputStream->getVideoDesc().getVideoFrameDesc().getHeight(), av_get_pix_fmt( desc[ Profile::avProfilePixelFormat ].c_str() ) );
 
-			_frameBuffer = new Image( outputVideo->getVideoDesc().getImageDesc() );
+			_frameBuffer = new VideoFrame( outputVideo->getVideoDesc().getVideoFrameDesc() );
 			
 			_transform = new VideoEssenceTransform();
 
@@ -170,12 +175,12 @@ StreamTranscoder::StreamTranscoder(
 		OutputVideo* outputVideo = new OutputVideo();
 		
 		_outputEssence = outputVideo;
-		ImageDesc inputImageDesc = static_cast<DummyVideo*>( _inputEssence )->getVideoDesc().getImageDesc();
-		outputVideo->setProfile( profile, inputImageDesc );
+		VideoFrameDesc inputVideoFrameDesc = static_cast<DummyVideo*>( _inputEssence )->getVideoDesc().getVideoFrameDesc();
+		outputVideo->setProfile( profile, inputVideoFrameDesc );
 
 		_outputStream = &outputFile.addVideoStream( outputVideo->getVideoDesc() );
-		_sourceBuffer = new Image( outputVideo->getVideoDesc().getImageDesc() );
-		_frameBuffer  = new Image( outputVideo->getVideoDesc().getImageDesc() );
+		_sourceBuffer = new VideoFrame( outputVideo->getVideoDesc().getVideoFrameDesc() );
+		_frameBuffer  = new VideoFrame( outputVideo->getVideoDesc().getVideoFrameDesc() );
 		
 		_transform = new VideoEssenceTransform();
 		
diff --git a/src/AvTranscoder/Transcoder/StreamTranscoder.hpp b/src/AvTranscoder/Transcoder/StreamTranscoder.hpp
index 74858576..7bb2ebf4 100644
--- a/src/AvTranscoder/Transcoder/StreamTranscoder.hpp
+++ b/src/AvTranscoder/Transcoder/StreamTranscoder.hpp
@@ -1,14 +1,13 @@
 #ifndef _AV_TRANSCODER_STREAM_TRANSCODER_HPP_
 #define _AV_TRANSCODER_STREAM_TRANSCODER_HPP_
 
+#include <AvTranscoder/common.hpp>
+
 #include <AvTranscoder/CodedStream/InputStream.hpp>
 
 #include <AvTranscoder/EssenceStream/InputVideo.hpp>
 #include <AvTranscoder/EssenceStream/OutputVideo.hpp>
 
-#include <AvTranscoder/EssenceStream/InputAudio.hpp>
-#include <AvTranscoder/EssenceStream/OutputAudio.hpp>
-
 #include <AvTranscoder/File/OutputFile.hpp>
 
 #include <AvTranscoder/Profile.hpp>
diff --git a/src/AvTranscoder/Transcoder/Transcoder.cpp b/src/AvTranscoder/Transcoder/Transcoder.cpp
index 47588fbd..b196dd63 100644
--- a/src/AvTranscoder/Transcoder/Transcoder.cpp
+++ b/src/AvTranscoder/Transcoder/Transcoder.cpp
@@ -1,8 +1,5 @@
-
 #include "Transcoder.hpp"
 
-#include <AvTranscoder/CodedStream/AvInputStream.hpp>
-
 namespace avtranscoder
 {
 
@@ -63,7 +60,7 @@ void Transcoder::add( const std::string& filename, const size_t streamIndex, Pro
 	addTranscodeStream( filename, streamIndex, profileDesc );
 }
 
-void Transcoder::add( const std::string& filename, const size_t streamIndex, Profile::ProfileDesc& profileDesc, EssenceDesc& essenceDesc )
+void Transcoder::add( const std::string& filename, const size_t streamIndex, Profile::ProfileDesc& profileDesc, CodedDesc& essenceDesc )
 {
 	_profile.update( profileDesc );
 	if( ! filename.length() )
@@ -122,7 +119,7 @@ void Transcoder::add( const std::string& filename, const size_t streamIndex, con
 	addTranscodeStream( filename, streamIndex, subStreamIndex, profileDesc );
 }
 
-void Transcoder::add( const std::string& filename, const size_t streamIndex, const int subStreamIndex, Profile::ProfileDesc& profileDesc, EssenceDesc& essenceDesc )
+void Transcoder::add( const std::string& filename, const size_t streamIndex, const int subStreamIndex, Profile::ProfileDesc& profileDesc, CodedDesc& essenceDesc )
 {
 	_profile.update( profileDesc );
 	
@@ -291,7 +288,7 @@ void Transcoder::addTranscodeStream( const std::string& filename, const size_t s
 	}
 }
 
-void Transcoder::addDummyStream( const Profile::ProfileDesc& profile, const EssenceDesc& essenceDesc )
+void Transcoder::addDummyStream( const Profile::ProfileDesc& profile, const CodedDesc& essenceDesc )
 {
 	if( ! profile.count( Profile::avProfileType ) )
 		throw std::runtime_error( "unable to found stream type (audio, video, etc.)" );
diff --git a/src/AvTranscoder/Transcoder/Transcoder.hpp b/src/AvTranscoder/Transcoder/Transcoder.hpp
index d5f8d05c..c235b70d 100644
--- a/src/AvTranscoder/Transcoder/Transcoder.hpp
+++ b/src/AvTranscoder/Transcoder/Transcoder.hpp
@@ -1,12 +1,18 @@
 #ifndef _AV_TRANSCODER_TRANSCODER_HPP_
 #define _AV_TRANSCODER_TRANSCODER_HPP_
 
+#include <AvTranscoder/common.hpp>
+
 #include <AvTranscoder/File/InputFile.hpp>
 #include <AvTranscoder/File/OutputFile.hpp>
+
 #include <AvTranscoder/CodedStream/InputStream.hpp>
+
 #include <AvTranscoder/EssenceStream/DummyAudio.hpp>
 #include <AvTranscoder/EssenceStream/DummyVideo.hpp>
+
 #include <AvTranscoder/ProgressListener.hpp>
+
 #include <AvTranscoder/Profile.hpp>
 
 #include "StreamTranscoder.hpp"
@@ -39,7 +45,7 @@ class Transcoder
 	/*
 	 * @note If filename is empty, add a dummy stream.
 	 */
-	void add( const std::string& filename, const size_t streamIndex, Profile::ProfileDesc& profileDesc, EssenceDesc& essenceDesc );
+	void add( const std::string& filename, const size_t streamIndex, Profile::ProfileDesc& profileDesc, CodedDesc& essenceDesc );
 	
 	/**
 	 * @brief Add a stream and set a profile
@@ -57,7 +63,7 @@ class Transcoder
 	/**
 	 * @note If filename is empty, add a dummy stream.
 	 */
-	void add( const std::string& filename, const size_t streamIndex, const int subStreamIndex, Profile::ProfileDesc& profileDesc, EssenceDesc& essenceDesc );
+	void add( const std::string& filename, const size_t streamIndex, const int subStreamIndex, Profile::ProfileDesc& profileDesc, CodedDesc& essenceDesc );
 
 	/**
 	 * @brief Add the stream
@@ -79,7 +85,7 @@ class Transcoder
 
 	void addTranscodeStream( const std::string& filename, const size_t streamIndex, const size_t subStreamIndex, Profile::ProfileDesc& profile );
 
-	void addDummyStream( const Profile::ProfileDesc& profile, const EssenceDesc& essenceDesc );
+	void addDummyStream( const Profile::ProfileDesc& profile, const CodedDesc& essenceDesc );
 
 	InputFile* addInputFile( const std::string& filename, const size_t streamIndex );
 
diff --git a/src/AvTranscoder/avTranscoder.i b/src/AvTranscoder/avTranscoder.i
index 04715345..c11d3372 100644
--- a/src/AvTranscoder/avTranscoder.i
+++ b/src/AvTranscoder/avTranscoder.i
@@ -11,14 +11,15 @@
 %{
 #include <AvTranscoder/common.hpp>
 
-#include <AvTranscoder/DatasStructures/Pixel.hpp>
-#include <AvTranscoder/DatasStructures/Frame.hpp>
-#include <AvTranscoder/DatasStructures/Image.hpp>
-#include <AvTranscoder/DatasStructures/AudioFrame.hpp>
-#include <AvTranscoder/DatasStructures/EssenceDesc.hpp>
-#include <AvTranscoder/DatasStructures/VideoDesc.hpp>
-#include <AvTranscoder/DatasStructures/AudioDesc.hpp>
-#include <AvTranscoder/DatasStructures/DataStreamDesc.hpp>
+#include <AvTranscoder/EssenceStructures/Pixel.hpp>
+#include <AvTranscoder/EssenceStructures/Frame.hpp>
+#include <AvTranscoder/EssenceStructures/VideoFrame.hpp>
+#include <AvTranscoder/EssenceStructures/AudioFrame.hpp>
+	
+#include <AvTranscoder/CodedStructures/CodedDesc.hpp>
+#include <AvTranscoder/CodedStructures/VideoDesc.hpp>
+#include <AvTranscoder/CodedStructures/AudioDesc.hpp>
+#include <AvTranscoder/CodedStructures/DataStreamDesc.hpp>
 
 #include <AvTranscoder/Metadatas/MediaMetadatasStructures.hpp>
 
@@ -64,14 +65,15 @@ namespace std {
 
 %include <AvTranscoder/common.hpp>
 
-%include <AvTranscoder/DatasStructures/Pixel.hpp>
-%include <AvTranscoder/DatasStructures/Frame.hpp>
-%include <AvTranscoder/DatasStructures/Image.hpp>
-%include <AvTranscoder/DatasStructures/AudioFrame.hpp>
-%include <AvTranscoder/DatasStructures/EssenceDesc.hpp>
-%include <AvTranscoder/DatasStructures/VideoDesc.hpp>
-%include <AvTranscoder/DatasStructures/AudioDesc.hpp>
-%include <AvTranscoder/DatasStructures/DataStreamDesc.hpp>
+%include <AvTranscoder/EssenceStructures/Pixel.hpp>
+%include <AvTranscoder/EssenceStructures/Frame.hpp>
+%include <AvTranscoder/EssenceStructures/VideoFrame.hpp>
+%include <AvTranscoder/EssenceStructures/AudioFrame.hpp>
+	
+%include <AvTranscoder/CodedStructures/CodedDesc.hpp>
+%include <AvTranscoder/CodedStructures/VideoDesc.hpp>
+%include <AvTranscoder/CodedStructures/AudioDesc.hpp>
+%include <AvTranscoder/CodedStructures/DataStreamDesc.hpp>
 
 %include <AvTranscoder/Metadatas/MediaMetadatasStructures.hpp>