Consolidate constants onto main mod