Tidying classes in src/simulator