Split up files into discrete sections, hopefully this will make merging a tad easier.