Moved data_util to the right place. Fixed makefile to handle multiple
files.