diff --git a/libeplayer3-arm/Makefile.am b/libeplayer3/Makefile.am
similarity index 100%
rename from libeplayer3-arm/Makefile.am
rename to libeplayer3/Makefile.am
diff --git a/libeplayer3-arm/README.md b/libeplayer3/README.md
similarity index 100%
rename from libeplayer3-arm/README.md
rename to libeplayer3/README.md
diff --git a/libeplayer3-arm/container/buff_ffmpeg.c b/libeplayer3/container/buff_ffmpeg.c
similarity index 100%
rename from libeplayer3-arm/container/buff_ffmpeg.c
rename to libeplayer3/container/buff_ffmpeg.c
diff --git a/libeplayer3-arm/container/container.c b/libeplayer3/container/container.c
similarity index 100%
rename from libeplayer3-arm/container/container.c
rename to libeplayer3/container/container.c
diff --git a/libeplayer3-arm/container/container_ffmpeg.c b/libeplayer3/container/container_ffmpeg.c
similarity index 100%
rename from libeplayer3-arm/container/container_ffmpeg.c
rename to libeplayer3/container/container_ffmpeg.c
diff --git a/libeplayer3-arm/container/flv2mpeg4_ffmpeg.c b/libeplayer3/container/flv2mpeg4_ffmpeg.c
similarity index 100%
rename from libeplayer3-arm/container/flv2mpeg4_ffmpeg.c
rename to libeplayer3/container/flv2mpeg4_ffmpeg.c
diff --git a/libeplayer3-arm/container/mpeg4p2_ffmpeg.c b/libeplayer3/container/mpeg4p2_ffmpeg.c
similarity index 100%
rename from libeplayer3-arm/container/mpeg4p2_ffmpeg.c
rename to libeplayer3/container/mpeg4p2_ffmpeg.c
diff --git a/libeplayer3-arm/container/wrapped_ffmpeg.c b/libeplayer3/container/wrapped_ffmpeg.c
similarity index 100%
rename from libeplayer3-arm/container/wrapped_ffmpeg.c
rename to libeplayer3/container/wrapped_ffmpeg.c
diff --git a/libeplayer3-arm/external/ffmpeg/get_bits.h b/libeplayer3/external/ffmpeg/get_bits.h
similarity index 100%
rename from libeplayer3-arm/external/ffmpeg/get_bits.h
rename to libeplayer3/external/ffmpeg/get_bits.h
diff --git a/libeplayer3-arm/external/ffmpeg/latmenc.h b/libeplayer3/external/ffmpeg/latmenc.h
similarity index 100%
rename from libeplayer3-arm/external/ffmpeg/latmenc.h
rename to libeplayer3/external/ffmpeg/latmenc.h
diff --git a/libeplayer3-arm/external/ffmpeg/mathops.h b/libeplayer3/external/ffmpeg/mathops.h
similarity index 100%
rename from libeplayer3-arm/external/ffmpeg/mathops.h
rename to libeplayer3/external/ffmpeg/mathops.h
diff --git a/libeplayer3-arm/external/ffmpeg/mpeg4audio.h b/libeplayer3/external/ffmpeg/mpeg4audio.h
similarity index 100%
rename from libeplayer3-arm/external/ffmpeg/mpeg4audio.h
rename to libeplayer3/external/ffmpeg/mpeg4audio.h
diff --git a/libeplayer3-arm/external/ffmpeg/put_bits.h b/libeplayer3/external/ffmpeg/put_bits.h
similarity index 100%
rename from libeplayer3-arm/external/ffmpeg/put_bits.h
rename to libeplayer3/external/ffmpeg/put_bits.h
diff --git a/libeplayer3-arm/external/ffmpeg/src/bitstream.c b/libeplayer3/external/ffmpeg/src/bitstream.c
similarity index 100%
rename from libeplayer3-arm/external/ffmpeg/src/bitstream.c
rename to libeplayer3/external/ffmpeg/src/bitstream.c
diff --git a/libeplayer3-arm/external/ffmpeg/src/latmenc.c b/libeplayer3/external/ffmpeg/src/latmenc.c
similarity index 100%
rename from libeplayer3-arm/external/ffmpeg/src/latmenc.c
rename to libeplayer3/external/ffmpeg/src/latmenc.c
diff --git a/libeplayer3-arm/external/ffmpeg/src/mpeg4audio.c b/libeplayer3/external/ffmpeg/src/mpeg4audio.c
similarity index 100%
rename from libeplayer3-arm/external/ffmpeg/src/mpeg4audio.c
rename to libeplayer3/external/ffmpeg/src/mpeg4audio.c
diff --git a/libeplayer3-arm/external/flv2mpeg4/doc/COPYING b/libeplayer3/external/flv2mpeg4/doc/COPYING
similarity index 100%
rename from libeplayer3-arm/external/flv2mpeg4/doc/COPYING
rename to libeplayer3/external/flv2mpeg4/doc/COPYING
diff --git a/libeplayer3-arm/external/flv2mpeg4/doc/CREDITS b/libeplayer3/external/flv2mpeg4/doc/CREDITS
similarity index 100%
rename from libeplayer3-arm/external/flv2mpeg4/doc/CREDITS
rename to libeplayer3/external/flv2mpeg4/doc/CREDITS
diff --git a/libeplayer3-arm/external/flv2mpeg4/doc/FFMPEG_CREDITS b/libeplayer3/external/flv2mpeg4/doc/FFMPEG_CREDITS
similarity index 100%
rename from libeplayer3-arm/external/flv2mpeg4/doc/FFMPEG_CREDITS
rename to libeplayer3/external/flv2mpeg4/doc/FFMPEG_CREDITS
diff --git a/libeplayer3-arm/external/flv2mpeg4/doc/FFMPEG_IMPORTS b/libeplayer3/external/flv2mpeg4/doc/FFMPEG_IMPORTS
similarity index 100%
rename from libeplayer3-arm/external/flv2mpeg4/doc/FFMPEG_IMPORTS
rename to libeplayer3/external/flv2mpeg4/doc/FFMPEG_IMPORTS
diff --git a/libeplayer3-arm/external/flv2mpeg4/doc/INSTALL b/libeplayer3/external/flv2mpeg4/doc/INSTALL
similarity index 100%
rename from libeplayer3-arm/external/flv2mpeg4/doc/INSTALL
rename to libeplayer3/external/flv2mpeg4/doc/INSTALL
diff --git a/libeplayer3-arm/external/flv2mpeg4/doc/README b/libeplayer3/external/flv2mpeg4/doc/README
similarity index 100%
rename from libeplayer3-arm/external/flv2mpeg4/doc/README
rename to libeplayer3/external/flv2mpeg4/doc/README
diff --git a/libeplayer3-arm/external/flv2mpeg4/flv2mpeg4.h b/libeplayer3/external/flv2mpeg4/flv2mpeg4.h
similarity index 100%
rename from libeplayer3-arm/external/flv2mpeg4/flv2mpeg4.h
rename to libeplayer3/external/flv2mpeg4/flv2mpeg4.h
diff --git a/libeplayer3-arm/external/flv2mpeg4/src/bitreader.h b/libeplayer3/external/flv2mpeg4/src/bitreader.h
similarity index 100%
rename from libeplayer3-arm/external/flv2mpeg4/src/bitreader.h
rename to libeplayer3/external/flv2mpeg4/src/bitreader.h
diff --git a/libeplayer3-arm/external/flv2mpeg4/src/bitwriter.h b/libeplayer3/external/flv2mpeg4/src/bitwriter.h
similarity index 100%
rename from libeplayer3-arm/external/flv2mpeg4/src/bitwriter.h
rename to libeplayer3/external/flv2mpeg4/src/bitwriter.h
diff --git a/libeplayer3-arm/external/flv2mpeg4/src/dcprediction.c b/libeplayer3/external/flv2mpeg4/src/dcprediction.c
similarity index 100%
rename from libeplayer3-arm/external/flv2mpeg4/src/dcprediction.c
rename to libeplayer3/external/flv2mpeg4/src/dcprediction.c
diff --git a/libeplayer3-arm/external/flv2mpeg4/src/dcprediction.h b/libeplayer3/external/flv2mpeg4/src/dcprediction.h
similarity index 100%
rename from libeplayer3-arm/external/flv2mpeg4/src/dcprediction.h
rename to libeplayer3/external/flv2mpeg4/src/dcprediction.h
diff --git a/libeplayer3-arm/external/flv2mpeg4/src/flv.h b/libeplayer3/external/flv2mpeg4/src/flv.h
similarity index 100%
rename from libeplayer3-arm/external/flv2mpeg4/src/flv.h
rename to libeplayer3/external/flv2mpeg4/src/flv.h
diff --git a/libeplayer3-arm/external/flv2mpeg4/src/flv2mpeg4.c b/libeplayer3/external/flv2mpeg4/src/flv2mpeg4.c
similarity index 100%
rename from libeplayer3-arm/external/flv2mpeg4/src/flv2mpeg4.c
rename to libeplayer3/external/flv2mpeg4/src/flv2mpeg4.c
diff --git a/libeplayer3-arm/external/flv2mpeg4/src/flvdecoder.c b/libeplayer3/external/flv2mpeg4/src/flvdecoder.c
similarity index 100%
rename from libeplayer3-arm/external/flv2mpeg4/src/flvdecoder.c
rename to libeplayer3/external/flv2mpeg4/src/flvdecoder.c
diff --git a/libeplayer3-arm/external/flv2mpeg4/src/m4v.h b/libeplayer3/external/flv2mpeg4/src/m4v.h
similarity index 100%
rename from libeplayer3-arm/external/flv2mpeg4/src/m4v.h
rename to libeplayer3/external/flv2mpeg4/src/m4v.h
diff --git a/libeplayer3-arm/external/flv2mpeg4/src/m4vencode.c b/libeplayer3/external/flv2mpeg4/src/m4vencode.c
similarity index 100%
rename from libeplayer3-arm/external/flv2mpeg4/src/m4vencode.c
rename to libeplayer3/external/flv2mpeg4/src/m4vencode.c
diff --git a/libeplayer3-arm/external/flv2mpeg4/src/m4vencode.h b/libeplayer3/external/flv2mpeg4/src/m4vencode.h
similarity index 100%
rename from libeplayer3-arm/external/flv2mpeg4/src/m4vencode.h
rename to libeplayer3/external/flv2mpeg4/src/m4vencode.h
diff --git a/libeplayer3-arm/external/flv2mpeg4/src/m4vencode_tables.h b/libeplayer3/external/flv2mpeg4/src/m4vencode_tables.h
similarity index 100%
rename from libeplayer3-arm/external/flv2mpeg4/src/m4vencode_tables.h
rename to libeplayer3/external/flv2mpeg4/src/m4vencode_tables.h
diff --git a/libeplayer3-arm/external/flv2mpeg4/src/type.h b/libeplayer3/external/flv2mpeg4/src/type.h
similarity index 100%
rename from libeplayer3-arm/external/flv2mpeg4/src/type.h
rename to libeplayer3/external/flv2mpeg4/src/type.h
diff --git a/libeplayer3-arm/include/aac.h b/libeplayer3/include/aac.h
similarity index 100%
rename from libeplayer3-arm/include/aac.h
rename to libeplayer3/include/aac.h
diff --git a/libeplayer3-arm/include/bcm_ioctls.h b/libeplayer3/include/bcm_ioctls.h
similarity index 100%
rename from libeplayer3-arm/include/bcm_ioctls.h
rename to libeplayer3/include/bcm_ioctls.h
diff --git a/libeplayer3-arm/include/common.h b/libeplayer3/include/common.h
similarity index 100%
rename from libeplayer3-arm/include/common.h
rename to libeplayer3/include/common.h
diff --git a/libeplayer3-arm/include/container.h b/libeplayer3/include/container.h
similarity index 100%
rename from libeplayer3-arm/include/container.h
rename to libeplayer3/include/container.h
diff --git a/libeplayer3-arm/include/debug.h b/libeplayer3/include/debug.h
similarity index 100%
rename from libeplayer3-arm/include/debug.h
rename to libeplayer3/include/debug.h
diff --git a/libeplayer3-arm/include/ffmpeg_metadata.h b/libeplayer3/include/ffmpeg_metadata.h
similarity index 100%
rename from libeplayer3-arm/include/ffmpeg_metadata.h
rename to libeplayer3/include/ffmpeg_metadata.h
diff --git a/libeplayer3-arm/include/manager.h b/libeplayer3/include/manager.h
similarity index 100%
rename from libeplayer3-arm/include/manager.h
rename to libeplayer3/include/manager.h
diff --git a/libeplayer3-arm/include/misc.h b/libeplayer3/include/misc.h
similarity index 100%
rename from libeplayer3-arm/include/misc.h
rename to libeplayer3/include/misc.h
diff --git a/libeplayer3-arm/include/output.h b/libeplayer3/include/output.h
similarity index 100%
rename from libeplayer3-arm/include/output.h
rename to libeplayer3/include/output.h
diff --git a/libeplayer3-arm/include/pcm.h b/libeplayer3/include/pcm.h
similarity index 100%
rename from libeplayer3-arm/include/pcm.h
rename to libeplayer3/include/pcm.h
diff --git a/libeplayer3-arm/include/pes.h b/libeplayer3/include/pes.h
similarity index 100%
rename from libeplayer3-arm/include/pes.h
rename to libeplayer3/include/pes.h
diff --git a/libeplayer3-arm/include/playback.h b/libeplayer3/include/playback.h
similarity index 100%
rename from libeplayer3-arm/include/playback.h
rename to libeplayer3/include/playback.h
diff --git a/libeplayer3-arm/include/stm_ioctls.h b/libeplayer3/include/stm_ioctls.h
similarity index 100%
rename from libeplayer3-arm/include/stm_ioctls.h
rename to libeplayer3/include/stm_ioctls.h
diff --git a/libeplayer3-arm/include/writer.h b/libeplayer3/include/writer.h
similarity index 100%
rename from libeplayer3-arm/include/writer.h
rename to libeplayer3/include/writer.h
diff --git a/libeplayer3-arm/main/exteplayer.c b/libeplayer3/main/exteplayer.c
similarity index 100%
rename from libeplayer3-arm/main/exteplayer.c
rename to libeplayer3/main/exteplayer.c
diff --git a/libeplayer3-arm/manager/audio.c b/libeplayer3/manager/audio.c
similarity index 100%
rename from libeplayer3-arm/manager/audio.c
rename to libeplayer3/manager/audio.c
diff --git a/libeplayer3-arm/manager/chapter.c b/libeplayer3/manager/chapter.c
similarity index 100%
rename from libeplayer3-arm/manager/chapter.c
rename to libeplayer3/manager/chapter.c
diff --git a/libeplayer3-arm/manager/manager.c b/libeplayer3/manager/manager.c
similarity index 100%
rename from libeplayer3-arm/manager/manager.c
rename to libeplayer3/manager/manager.c
diff --git a/libeplayer3-arm/manager/subtitle.c b/libeplayer3/manager/subtitle.c
similarity index 100%
rename from libeplayer3-arm/manager/subtitle.c
rename to libeplayer3/manager/subtitle.c
diff --git a/libeplayer3-arm/manager/video.c b/libeplayer3/manager/video.c
similarity index 100%
rename from libeplayer3-arm/manager/video.c
rename to libeplayer3/manager/video.c
diff --git a/libeplayer3-arm/output/linuxdvb_buffering.c b/libeplayer3/output/linuxdvb_buffering.c
similarity index 100%
rename from libeplayer3-arm/output/linuxdvb_buffering.c
rename to libeplayer3/output/linuxdvb_buffering.c
diff --git a/libeplayer3-arm/output/linuxdvb_fake.c b/libeplayer3/output/linuxdvb_fake.c
similarity index 100%
rename from libeplayer3-arm/output/linuxdvb_fake.c
rename to libeplayer3/output/linuxdvb_fake.c
diff --git a/libeplayer3-arm/output/linuxdvb_mipsel.c b/libeplayer3/output/linuxdvb_mipsel.c
similarity index 100%
rename from libeplayer3-arm/output/linuxdvb_mipsel.c
rename to libeplayer3/output/linuxdvb_mipsel.c
diff --git a/libeplayer3-arm/output/linuxdvb_sh4.c b/libeplayer3/output/linuxdvb_sh4.c
similarity index 100%
rename from libeplayer3-arm/output/linuxdvb_sh4.c
rename to libeplayer3/output/linuxdvb_sh4.c
diff --git a/libeplayer3-arm/output/output.c b/libeplayer3/output/output.c
similarity index 100%
rename from libeplayer3-arm/output/output.c
rename to libeplayer3/output/output.c
diff --git a/libeplayer3-arm/output/output_subtitle.c b/libeplayer3/output/output_subtitle.c
similarity index 100%
rename from libeplayer3-arm/output/output_subtitle.c
rename to libeplayer3/output/output_subtitle.c
diff --git a/libeplayer3-arm/output/writer/common/misc.c b/libeplayer3/output/writer/common/misc.c
similarity index 100%
rename from libeplayer3-arm/output/writer/common/misc.c
rename to libeplayer3/output/writer/common/misc.c
diff --git a/libeplayer3-arm/output/writer/common/pes.c b/libeplayer3/output/writer/common/pes.c
similarity index 100%
rename from libeplayer3-arm/output/writer/common/pes.c
rename to libeplayer3/output/writer/common/pes.c
diff --git a/libeplayer3-arm/output/writer/common/writer.c b/libeplayer3/output/writer/common/writer.c
similarity index 100%
rename from libeplayer3-arm/output/writer/common/writer.c
rename to libeplayer3/output/writer/common/writer.c
diff --git a/libeplayer3-arm/output/writer/mipsel/aac.c b/libeplayer3/output/writer/mipsel/aac.c
similarity index 100%
rename from libeplayer3-arm/output/writer/mipsel/aac.c
rename to libeplayer3/output/writer/mipsel/aac.c
diff --git a/libeplayer3-arm/output/writer/mipsel/ac3.c b/libeplayer3/output/writer/mipsel/ac3.c
similarity index 100%
rename from libeplayer3-arm/output/writer/mipsel/ac3.c
rename to libeplayer3/output/writer/mipsel/ac3.c
diff --git a/libeplayer3-arm/output/writer/mipsel/amr.c b/libeplayer3/output/writer/mipsel/amr.c
similarity index 100%
rename from libeplayer3-arm/output/writer/mipsel/amr.c
rename to libeplayer3/output/writer/mipsel/amr.c
diff --git a/libeplayer3-arm/output/writer/mipsel/divx3.c b/libeplayer3/output/writer/mipsel/divx3.c
similarity index 100%
rename from libeplayer3-arm/output/writer/mipsel/divx3.c
rename to libeplayer3/output/writer/mipsel/divx3.c
diff --git a/libeplayer3-arm/output/writer/mipsel/dts.c b/libeplayer3/output/writer/mipsel/dts.c
similarity index 100%
rename from libeplayer3-arm/output/writer/mipsel/dts.c
rename to libeplayer3/output/writer/mipsel/dts.c
diff --git a/libeplayer3-arm/output/writer/mipsel/h264.c b/libeplayer3/output/writer/mipsel/h264.c
similarity index 100%
rename from libeplayer3-arm/output/writer/mipsel/h264.c
rename to libeplayer3/output/writer/mipsel/h264.c
diff --git a/libeplayer3-arm/output/writer/mipsel/h265.c b/libeplayer3/output/writer/mipsel/h265.c
similarity index 100%
rename from libeplayer3-arm/output/writer/mipsel/h265.c
rename to libeplayer3/output/writer/mipsel/h265.c
diff --git a/libeplayer3-arm/output/writer/mipsel/lpcm.c b/libeplayer3/output/writer/mipsel/lpcm.c
similarity index 100%
rename from libeplayer3-arm/output/writer/mipsel/lpcm.c
rename to libeplayer3/output/writer/mipsel/lpcm.c
diff --git a/libeplayer3-arm/output/writer/mipsel/mjpeg.c b/libeplayer3/output/writer/mipsel/mjpeg.c
similarity index 100%
rename from libeplayer3-arm/output/writer/mipsel/mjpeg.c
rename to libeplayer3/output/writer/mipsel/mjpeg.c
diff --git a/libeplayer3-arm/output/writer/mipsel/mp3.c b/libeplayer3/output/writer/mipsel/mp3.c
similarity index 100%
rename from libeplayer3-arm/output/writer/mipsel/mp3.c
rename to libeplayer3/output/writer/mipsel/mp3.c
diff --git a/libeplayer3-arm/output/writer/mipsel/mpeg2.c b/libeplayer3/output/writer/mipsel/mpeg2.c
similarity index 100%
rename from libeplayer3-arm/output/writer/mipsel/mpeg2.c
rename to libeplayer3/output/writer/mipsel/mpeg2.c
diff --git a/libeplayer3-arm/output/writer/mipsel/mpeg4.c b/libeplayer3/output/writer/mipsel/mpeg4.c
similarity index 100%
rename from libeplayer3-arm/output/writer/mipsel/mpeg4.c
rename to libeplayer3/output/writer/mipsel/mpeg4.c
diff --git a/libeplayer3-arm/output/writer/mipsel/pcm.c b/libeplayer3/output/writer/mipsel/pcm.c
similarity index 100%
rename from libeplayer3-arm/output/writer/mipsel/pcm.c
rename to libeplayer3/output/writer/mipsel/pcm.c
diff --git a/libeplayer3-arm/output/writer/mipsel/vc1.c b/libeplayer3/output/writer/mipsel/vc1.c
similarity index 100%
rename from libeplayer3-arm/output/writer/mipsel/vc1.c
rename to libeplayer3/output/writer/mipsel/vc1.c
diff --git a/libeplayer3-arm/output/writer/mipsel/vp.c b/libeplayer3/output/writer/mipsel/vp.c
similarity index 100%
rename from libeplayer3-arm/output/writer/mipsel/vp.c
rename to libeplayer3/output/writer/mipsel/vp.c
diff --git a/libeplayer3-arm/output/writer/mipsel/wma.c b/libeplayer3/output/writer/mipsel/wma.c
similarity index 100%
rename from libeplayer3-arm/output/writer/mipsel/wma.c
rename to libeplayer3/output/writer/mipsel/wma.c
diff --git a/libeplayer3-arm/output/writer/mipsel/wmv.c b/libeplayer3/output/writer/mipsel/wmv.c
similarity index 100%
rename from libeplayer3-arm/output/writer/mipsel/wmv.c
rename to libeplayer3/output/writer/mipsel/wmv.c
diff --git a/libeplayer3-arm/output/writer/mipsel/writer.c b/libeplayer3/output/writer/mipsel/writer.c
similarity index 100%
rename from libeplayer3-arm/output/writer/mipsel/writer.c
rename to libeplayer3/output/writer/mipsel/writer.c
diff --git a/libeplayer3-arm/output/writer/sh4/aac.c b/libeplayer3/output/writer/sh4/aac.c
similarity index 100%
rename from libeplayer3-arm/output/writer/sh4/aac.c
rename to libeplayer3/output/writer/sh4/aac.c
diff --git a/libeplayer3-arm/output/writer/sh4/ac3.c b/libeplayer3/output/writer/sh4/ac3.c
similarity index 100%
rename from libeplayer3-arm/output/writer/sh4/ac3.c
rename to libeplayer3/output/writer/sh4/ac3.c
diff --git a/libeplayer3-arm/output/writer/sh4/divx.c b/libeplayer3/output/writer/sh4/divx.c
similarity index 100%
rename from libeplayer3-arm/output/writer/sh4/divx.c
rename to libeplayer3/output/writer/sh4/divx.c
diff --git a/libeplayer3-arm/output/writer/sh4/divx2.c b/libeplayer3/output/writer/sh4/divx2.c
similarity index 100%
rename from libeplayer3-arm/output/writer/sh4/divx2.c
rename to libeplayer3/output/writer/sh4/divx2.c
diff --git a/libeplayer3-arm/output/writer/sh4/dts.c b/libeplayer3/output/writer/sh4/dts.c
similarity index 100%
rename from libeplayer3-arm/output/writer/sh4/dts.c
rename to libeplayer3/output/writer/sh4/dts.c
diff --git a/libeplayer3-arm/output/writer/sh4/h263.c b/libeplayer3/output/writer/sh4/h263.c
similarity index 100%
rename from libeplayer3-arm/output/writer/sh4/h263.c
rename to libeplayer3/output/writer/sh4/h263.c
diff --git a/libeplayer3-arm/output/writer/sh4/h264.c b/libeplayer3/output/writer/sh4/h264.c
similarity index 100%
rename from libeplayer3-arm/output/writer/sh4/h264.c
rename to libeplayer3/output/writer/sh4/h264.c
diff --git a/libeplayer3-arm/output/writer/sh4/mp3.c b/libeplayer3/output/writer/sh4/mp3.c
similarity index 100%
rename from libeplayer3-arm/output/writer/sh4/mp3.c
rename to libeplayer3/output/writer/sh4/mp3.c
diff --git a/libeplayer3-arm/output/writer/sh4/mpeg2.c b/libeplayer3/output/writer/sh4/mpeg2.c
similarity index 100%
rename from libeplayer3-arm/output/writer/sh4/mpeg2.c
rename to libeplayer3/output/writer/sh4/mpeg2.c
diff --git a/libeplayer3-arm/output/writer/sh4/pcm.c b/libeplayer3/output/writer/sh4/pcm.c
similarity index 100%
rename from libeplayer3-arm/output/writer/sh4/pcm.c
rename to libeplayer3/output/writer/sh4/pcm.c
diff --git a/libeplayer3-arm/output/writer/sh4/pes.c b/libeplayer3/output/writer/sh4/pes.c
similarity index 100%
rename from libeplayer3-arm/output/writer/sh4/pes.c
rename to libeplayer3/output/writer/sh4/pes.c
diff --git a/libeplayer3-arm/output/writer/sh4/vc1.c b/libeplayer3/output/writer/sh4/vc1.c
similarity index 100%
rename from libeplayer3-arm/output/writer/sh4/vc1.c
rename to libeplayer3/output/writer/sh4/vc1.c
diff --git a/libeplayer3-arm/output/writer/sh4/vorbis.c b/libeplayer3/output/writer/sh4/vorbis.c
similarity index 100%
rename from libeplayer3-arm/output/writer/sh4/vorbis.c
rename to libeplayer3/output/writer/sh4/vorbis.c
diff --git a/libeplayer3-arm/output/writer/sh4/wma.c b/libeplayer3/output/writer/sh4/wma.c
similarity index 100%
rename from libeplayer3-arm/output/writer/sh4/wma.c
rename to libeplayer3/output/writer/sh4/wma.c
diff --git a/libeplayer3-arm/output/writer/sh4/wmv.c b/libeplayer3/output/writer/sh4/wmv.c
similarity index 100%
rename from libeplayer3-arm/output/writer/sh4/wmv.c
rename to libeplayer3/output/writer/sh4/wmv.c
diff --git a/libeplayer3-arm/output/writer/sh4/writer.c b/libeplayer3/output/writer/sh4/writer.c
similarity index 100%
rename from libeplayer3-arm/output/writer/sh4/writer.c
rename to libeplayer3/output/writer/sh4/writer.c
diff --git a/libeplayer3-arm/playback/playback.c b/libeplayer3/playback/playback.c
similarity index 100%
rename from libeplayer3-arm/playback/playback.c
rename to libeplayer3/playback/playback.c