Change the directory structure cont'd