Header file names has adjusted to new structuring.