redesigne directory structure