First refactor to remove wear sample app classes