adjust Makefile to accomodate packaging change

- get kindlegen from subfolder
- add test