Finish clean folder Hierarchy
Signed-off-by: Hui Zheng <fengyimzy@gmail.com>