Moved util/comm -> common