Updated.
Refactored Names.
Extended more Abstract classes in core components.