Update for separation of API from Mod

Signed-off-by: Steven Downer <grinch@outlook.com>
Fix package path

Signed-off-by: Steven Downer <grinch@outlook.com>
Fix test package path

Signed-off-by: Steven Downer <grinch@outlook.com>
Merge remote-tracking branch 'upstream/master'