directory cleanup - I hope nothing broke