Moved point functions to their own namespace
Added guard to help with testing