add more tests
update patch-config
update directory structure