Re-arrange the file structure