Edited structure of Simulator
Tests resolved and GUI started