refs #17 Change Component structure