Code and functionallity of the Component and Context classes/files were split into several super-classes.