Change backing classes to be 'internal'