rework directory structure