Moving common stuff up one level.