Reorganise app init and config keys