Changed access level of various classes