refactoring package name to reflect component name