(cherry picked from commit 014c501237)
014c501237
They have very different purpose, so make things easier to work with by having multiple directories.