Fix and organize gems stuff
mask email