Added gui and solver packages