Forward ported PR 570

Change included allows model package name (directory structure) to
contain the `-` (dash) character.
Merge pull request #338 from mhitza/pr-570

Forward ported PR 570