Rearranging packages
Removing outside global.gems dependency
Removing eclipse