Better err handling
Rename & add package.json