Renamed base_types.h to types.h