Revert "derp"

This reverts commit cb4901937d1802bd1d07b7733ac20bdc229d1970.
Revert "moved packages around"

This reverts commit 05ee7582132ce2d358571dcb74f4b661f1c4d265.
Revert "cm: Add Trebuchet back to the build"

This reverts commit bd4124a38608c0efcec8783432a745f3916dcc17.