Moved refactored simulator to simuser