combine wildcard utility and match utility; move single file package classes into sample package