Restructured hklgen directory