Repartitioned code into more sensible, dependency-based plugins