Cleaned up directory organization. Renamed DeckMaker to Deck class