Integrated makefiles together and table regen caused by md5sums to reduce rebuilds