Complete move to requirejs including automated and matching pairs