Refactor to handle symmetry
Rename file