RequireJs fixes, structure ready