refactoring continued
change package names in order to reflect component name