Separated NGon into a different cpp and added header