Move stuff in better places.