9.x

Change the directory structure