Fix typo and modify internal file organization
Fix bad cp