Refactor DeckBuilder

Refactor it to fit reflux