Move lists to maintain plain structure
