Cleanup

Just cleaning the structure and files in preparation for a merge
Updated package.json for deployment

Incremented the version number and added dependencies