simplify to reflect new direcrtory structure