Re-packaged two more classes