plugins reorganizatoin, encryption class drivers renamed