Split out app_control into 2 files.