Rearrange, add package.json
Sort out error callbacks