Refactoring and updating

Refactoring to match new storm-contrib submodule structure.