Cleaned up some issues with packaging and zipped data files