directory name changes, minor edits