Restructure of the directory