directory structure refactory

directory structure refactory