Reestructure directory tree