Restructure Brocfile, optimise for readability