Change Readme + package.json and clean up