Fixed access modifiers for inner classes to avoid classloading issues

As discussed with Pete, package protected access modifiers are causing class loading issues.