Moved things to more relevant places.