Refactored CurrentPosition to extract site

Split the definition into two parts:  relativePosition and site.