More work towards tidying the structure placement