Move all strategies out of a partial class and into a namespace