Reorganizing directory, cleaning detritus