Re-organize dependencies