Refactoring and updating

Refactoring to match new storm-contrib submodule structure.
Merge pull request #1 from ilionblaze/development

Refactoring and updating