diff --git a/libeplayer3/container/container_ffmpeg.cpp b/libeplayer3/input.cpp
similarity index 100%
rename from libeplayer3/container/container_ffmpeg.cpp
rename to libeplayer3/input.cpp
diff --git a/libeplayer3/manager/manager.cpp b/libeplayer3/manager.cpp
similarity index 100%
rename from libeplayer3/manager/manager.cpp
rename to libeplayer3/manager.cpp
diff --git a/libeplayer3/output/output.cpp b/libeplayer3/output.cpp
similarity index 100%
rename from libeplayer3/output/output.cpp
rename to libeplayer3/output.cpp
diff --git a/libeplayer3/playback/playback.cpp b/libeplayer3/player.cpp
similarity index 100%
rename from libeplayer3/playback/playback.cpp
rename to libeplayer3/player.cpp
diff --git a/libeplayer3/output/writer/ac3.cpp b/libeplayer3/writer/ac3.cpp
similarity index 100%
rename from libeplayer3/output/writer/ac3.cpp
rename to libeplayer3/writer/ac3.cpp
diff --git a/libeplayer3/output/writer/divx.cpp b/libeplayer3/writer/divx.cpp
similarity index 100%
rename from libeplayer3/output/writer/divx.cpp
rename to libeplayer3/writer/divx.cpp
diff --git a/libeplayer3/output/writer/dts.cpp b/libeplayer3/writer/dts.cpp
similarity index 100%
rename from libeplayer3/output/writer/dts.cpp
rename to libeplayer3/writer/dts.cpp
diff --git a/libeplayer3/output/writer/flac.cpp b/libeplayer3/writer/flac.cpp
similarity index 100%
rename from libeplayer3/output/writer/flac.cpp
rename to libeplayer3/writer/flac.cpp
diff --git a/libeplayer3/output/writer/h263.cpp b/libeplayer3/writer/h263.cpp
similarity index 100%
rename from libeplayer3/output/writer/h263.cpp
rename to libeplayer3/writer/h263.cpp
diff --git a/libeplayer3/output/writer/h264.cpp b/libeplayer3/writer/h264.cpp
similarity index 100%
rename from libeplayer3/output/writer/h264.cpp
rename to libeplayer3/writer/h264.cpp
diff --git a/libeplayer3/output/writer/misc.cpp b/libeplayer3/writer/misc.cpp
similarity index 100%
rename from libeplayer3/output/writer/misc.cpp
rename to libeplayer3/writer/misc.cpp
diff --git a/libeplayer3/output/writer/mp3.cpp b/libeplayer3/writer/mp3.cpp
similarity index 100%
rename from libeplayer3/output/writer/mp3.cpp
rename to libeplayer3/writer/mp3.cpp
diff --git a/libeplayer3/output/writer/mpeg2.cpp b/libeplayer3/writer/mpeg2.cpp
similarity index 100%
rename from libeplayer3/output/writer/mpeg2.cpp
rename to libeplayer3/writer/mpeg2.cpp
diff --git a/libeplayer3/output/writer/pcm.cpp b/libeplayer3/writer/pcm.cpp
similarity index 100%
rename from libeplayer3/output/writer/pcm.cpp
rename to libeplayer3/writer/pcm.cpp
diff --git a/libeplayer3/output/writer/pes.cpp b/libeplayer3/writer/pes.cpp
similarity index 100%
rename from libeplayer3/output/writer/pes.cpp
rename to libeplayer3/writer/pes.cpp
diff --git a/libeplayer3/output/writer/vc1.cpp b/libeplayer3/writer/vc1.cpp
similarity index 100%
rename from libeplayer3/output/writer/vc1.cpp
rename to libeplayer3/writer/vc1.cpp
diff --git a/libeplayer3/output/writer/wmv.cpp b/libeplayer3/writer/wmv.cpp
similarity index 100%
rename from libeplayer3/output/writer/wmv.cpp
rename to libeplayer3/writer/wmv.cpp
diff --git a/libeplayer3/output/writer/writer.cpp b/libeplayer3/writer/writer.cpp
similarity index 100%
rename from libeplayer3/output/writer/writer.cpp
rename to libeplayer3/writer/writer.cpp