Move stuff around to better locations