Do some moving and tidying