Refactoring - renaming components package to component