Add the ability to Sort the card set
Refactor into more source files