Reform Gemfile. And bundle update
Refactor completely. Classify and modulable