Reorganize interface