move into the new structure