Simplifying the output plugin folder structure and removing some unused code
Fix for C++11 compiler errors on 13.04 (String concatenation requires intervening space)