Moved utils/keys into core module