Restructuration of directory struc