Move variables in classes to public to ease transition to C