Refactoring

Flatten out “Position” objects