continues refactor the code structure.
change directory structure.