Cleaned up schema, fixed fields
Cleaned up schema, fixed fields

-Added additional fields needed for template coordinates
-Cleaned up schema, moved unused tables to bottom of file.

nus-mtp/bill-egoat,nus-mtp/bill-egoat,nus-mtp/bill-egoat,nus-mtp/bill-egoat