Implement some fixes after a review

Also move rubygems_plugin to root lib dir