Move source to a better spot