acpt: Reorganize in which files the scenario are defined & various fixes