Removed toUrl call when not necessary
Added plugin subdirectory TunaPlugins