cleanup, rename dir