Updated require_relative stuff