split defined type into separate file. unbreaks tests