[aquamar] remove visibility of classes which should not be a part of API