Added support for Component deserialization.
Moved classes.