Reorganize dependency