Move standard structures to layouts