Split UG/PG data futher

Splits UG and PG data & datatypes
Adds deliveries
Adds some basic caching 
API outputs
Fixed multiple minor bugs