move components to dedicated package