improvements +rework directory structure