Move file extraction to external functions
Allow for more flexibility in naming source sections
And yet even more flexibility in naming source sections