Better header organization
GitTip