reorganizing into directories