Cleaned up the modules and added a package JSON