Moving location for ComponentGroup structure.

Will refactor GenericSystem in the future so that it is more readable.