Moving MainModel back to using sample product packages
Moving main model back to using sample product package