updated new structure with test dir and proj dir