Eliminating useless information

When initially modifying the code, I made a couple of changes that currently
have no meaning. This patch reverts some of those changes.
nnnSIM-module.h

To be able to test out the modules we have finished, I have created a header
file to make inclusion in scenario files a little easier. This will probably
not be used in the final product, but will suffice for the smaller tests we
have to run.