Revert "moving directory names to private.mk"

This reverts commit 5d7ca9b037081e586bfd2ea69efd8a8b4a7511af.