Refactoring and cleanup; adding in package.json so dependencies can be easily grabbed in new installs