Merge http and util into core