Change includes to relative path

Update to #398

Necessary for projects including gamgee source

Group include lines by source