Merge "Refactor dependency classes in their package."
Xavier Ducrohet [Fri, 15 Mar 2013 20:54:56 +0000 (20:54 +0000)]

Trivial merge