Renaming of dir. Plus: minor fixes.