Change the directory structure

Change the directory structure