Reorganize package.json properties