Some refactoring

Replaced *Quantity with Quantity<*> where possible
Implemented Points to hold a List<Point>