moved gamestate and cargo to a better location
updating upgrade mecanism