moved common-util to the components folder