Updated folders and plugin support