Move ServerFactory downstream. Closes #221