Photo_placer refactoring