More work transferring structures to structured dirs