restruct the embedded world
rename unstandard filename