Small improvements

Further migration of code to OO model
removed config file from git
added resetdb in Makefile to remove db files