Moving some items around that should have been already