Move imports around
Move all NPM stuff to package.json