reorganising gem lib/