Rename include/util.h to include/bikedemo/util.h