Made a good amount of changes
Reorder packagejson