Massive gem update and refactoring
moved files
working on improvements