Removed duplicated classes & used 'require' vs 'require_relative'

Gem best practices is using require, not require_relative. There were
also two extra files that duplicated code.