Bundler gem some things
Reorganise
Naming