Revert "Refactor hierarchy to separate languages."

This reverts commit 03ff4353a5c193bef8193f4adb90c8cbd47e2505.
Revert "Undo this move; will redo."

This reverts commit ab31b2459542ef7938a65a3fc946391499f39698.
Revert "Revert "Working unit test compilation.""

This reverts commit 03c04de56b0279ce614e7f31b3f949e2dfb70f03.
Revert "Re-add"

This reverts commit be4b77ca120bfee309dc7eaebac64d08b8f16ee1.