Upgrade Gems and general refactoring/updates to the project