Move builder strategy classes into strategies/
Add v2.0.0-rc11