Cleanup of dir structure