Missiles shooting, and a bunch of other refactoring

I removed the node_modules folder because it was causing conflict issues - you may need to npm install again after updating.
Might be prudent to add node_modules folder to .git_ignore file, so that changes in the node modules are not tracked.