1. Changed the directory structure for the comparators
2. Fixed setup and init routines to import comparators correctly