Break entity into separate file