Fixed structure and added decks classes