Add package.json, minor clean up