Initial code move out of V8/Infrastructure