reorganize interfaces in Base