change directory structure to make it more reasonable