tidy dir structure