Move data classes to separate assembly