-. refactoring: changed packages for client side components.