Convert everything to use a Types file
Delete old Makefile