Revert "Remove redundant subfolder"

This reverts commit 780ec29d106c863a694899da2128932fd9ae21bb.