Refactoring, decks

Refactored structure of project. Added deck functionality, decks are
read in correctly.