Moving DataStructures out of Plugin directory