Reorganization of TreMoR repo to simplify it for Mitch