move files; fix package.json