more removal of require_relative's