Move simulation related code to own namespace
Add import