Reorganize deps