moved everything to one solution