changed directory structure, now is more typical