Changing classes back to internal because we expose the assembly now