Arrange the directory structure

Arrange the directory structure