Reoganize Solution References