Package cleanup, include Makefile
Add tests for Dataset, cleanup source files