moved data class to new file