Restructred the directory system.