Moved files in runner into core