- moved more classes from Internal Commons.