Change directory structure

Change directory structure