made classes serializable + data naming conventions