Add package.json, cleanup