structure: move things around