Reorganize the directory structure

Reorganize the directory structure