Solution reorganization corlib system seperation