Make use of new structure for simulation
Break out error present check into separate module

This will make it easier to pipeline in the future.
Warning fixes
Update README