Adopt new directory hierarchy cc #2