Including in-package

Forgot to move to the package after creating it.
Re-organizing to avoid style warnings

Some style warnings were present when loading the module becausae of the
order of the function declarations, this version fixes that.
Revert "Re-organizing to avoid style warnings"

This reverts commit c3fb0ffad959c6b58fdfc2b664afc0a963bf58ab.
Reorganizing to avoid stype warnings

This loads funcions in the right order to avoid style warnings.