Change folder names to prevent Package conflicts  with other plugins