reorg some helpers into common file
importing from new location