Restructure gem properly