Moving MainModel back to using sample product packages