fix package.json and readme, reorganize stuff