clean up dir structure