Refactoring structs and removing factorygirl