move structs out of template classes