Refactoring
Added gem groups