more refactor, moved blackjack to own package