patch-a: reflect directory layout for tk4 patch-b: tk4 compatibility
Submitted by: Thomas Gellekum <thomas@ghpc8.ihf.rwth-aachen.de>