Restructure to remove in-gem require_relative
Update gemspec