Moriah chamber reorganizes

Looks to work closely with Ti chamber