More sensible directory structure

Global project include will need own directory so make that directory
now and just put everything in there instead.