some fixes
renaming of containing directory