Refactor factory girl files