Simulator start
Changed namespace + refactoring