rework directory structure.