major refactor
package.json