Continued work with structure. Started on CardFactories and CardInfoHandler.
Resolved mergeconflict.