moved things into an include dir