small update to move Component heirarchy to the common package