Removed need for require_relative all around