Refactoring packages and created new labeled component.