Reorgansing files for FFmpeg CLI support