Improve gemspec dependencies split & order