Fix loading issues

Order and text protocol has changed since the last I did requirejs.
Fixed loading issues. WIP

Change-Id: Iccb8b69542e3f863a0a7f3cea9bb001e3ba5b754