small refactoring
better way of include files
set gems versions
change the order of including files, mini-refactoring, add new field in the model