Reorganize Heyday config