Change the directory structure for itl remake cont'd