Remove core.h
Merge routines into Config