Tidied plugins to subfolder, fixed playstream