Refactor - Moved "Point" to "Smart.Point"