relocated more files to design