More splitting of type.cpp
Replace old types.h header in some files with new nams