I did some hacky stuff in the Makefile for libmojo to ensure things would continue building when everything gets upreved to r456626. However, we should fix this.

Once the uprev is complete, move the directories into the right places and fix all users.