change directory structure to be more logical