Move layout to geometry ns.