Core.hs: remove module hierarchy, make Core a stand-alone module