Reorganized package.json, reorganized .gitignore