Trac #12694: Normalize directory structure


PR for issues #12694