Removed Caliper and changed everything to Thyme

The code structure still has some remnants of the things I had to do for Caliper