Rearranging Article factory. All specs pass.

@TODO - Review migration to confirm data is properly migrated.