Codebase reorganization and refactoring
Removing references to delegate and delegate_to
Updating gems
Merge branch 'refactor'