Consolidate circuit models into Circuit.h/cpp