Moved everything around, hooked up npm