Moved types to class library