re-org of directory structure