Make a few classes in output to be package private