directory name change and cleanup