Also shuffle headers to place widget includes near end. This leaves the widgets directory solely for defining Widget IDs.