Add macros to create generic basetypes

 - remove old type files