Merged SmartCard with SmartCardDB
Removed old files. Updated serialization