Modified scenario to include more general definitions for all sections. Also split main file.