flatten the dirs a bit

eliminate duplicate headers by moving them to a new include dir