Fix code

separate file and modify name in manifest