Made in tune with latest mojo structure. Updated mojo libs