made some changes, back in working state
fixed directory structure