initial commit for API 3.0 (replaced all)

156 files changed, 0 insertions, 15233 deletions

diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AddCommand_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AddCommand_request.h
deleted file mode 100644
index ed961bfdb..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AddCommand_request.h
+++ /dev/null
@@ -1,113 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_ADDCOMMAND_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_ADDCOMMAND_REQUEST_INCLUDE
-
-#include <vector>
-#include <string>
-
-#include "Image.h"
-#include "MenuParams.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-/**
-     Adds a command to the in application menu.
-     Either menuParams or vrCommands must be provided.
-*/
-
-  class AddCommand_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    AddCommand_request(const AddCommand_request& c);
-    AddCommand_request(void);
-    
-    virtual ~AddCommand_request(void);
-  
-    AddCommand_request& operator =(const AddCommand_request&);
-  
-    bool checkIntegrity(void);
-
-    unsigned int get_cmdID(void) const;
-    const MenuParams* get_menuParams(void) const;
-    const std::vector<std::string>* get_vrCommands(void) const;
-    const Image* get_cmdIcon(void) const;
-
-    bool set_cmdID(unsigned int cmdID_);
-    void reset_menuParams(void);
-    bool set_menuParams(const MenuParams& menuParams_);
-    void reset_vrCommands(void);
-    bool set_vrCommands(const std::vector<std::string>& vrCommands_);
-    void reset_cmdIcon(void);
-    bool set_cmdIcon(const Image& cmdIcon_);
-
-  private:
-  
-    friend class AddCommand_requestMarshaller;
-
-
-///  unique ID of the command to add.
-      unsigned int cmdID;	//!<  (0,2000000000)
-
-///  Optional sub value containing menu parameters
-      MenuParams* menuParams;
-
-/**
-     An array of strings to be used as VR synonyms for this command.
-     If this array is provided, it may not be empty.
-*/
-      std::vector<std::string>* vrCommands;	//!<   [%s..%s] (99)
-
-/**
-     Image struct determining whether static or dynamic icon.
-     If omitted on supported displays, no (or the default if applicable) icon shall be displayed.
-*/
-      Image* cmdIcon;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AddCommand_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AddCommand_response.h
deleted file mode 100644
index 7742971f1..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AddCommand_response.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_ADDCOMMAND_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_ADDCOMMAND_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    class AddCommand_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        AddCommand_response(const AddCommand_response& c);
-        AddCommand_response(void);
-
-        virtual ~AddCommand_response(void);
-
-        AddCommand_response& operator =(const AddCommand_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class AddCommand_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AddSubMenu_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AddSubMenu_request.h
deleted file mode 100644
index 1b98b766f..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AddSubMenu_request.h
+++ /dev/null
@@ -1,101 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_ADDSUBMENU_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_ADDSUBMENU_REQUEST_INCLUDE
-
-#include <string>
-
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Adds a sub menu to the in-application menu.
-
-  class AddSubMenu_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    AddSubMenu_request(const AddSubMenu_request& c);
-    AddSubMenu_request(void);
-    
-    virtual ~AddSubMenu_request(void);
-  
-    AddSubMenu_request& operator =(const AddSubMenu_request&);
-  
-    bool checkIntegrity(void);
-
-    unsigned int get_menuID(void) const;
-    const unsigned int* get_position(void) const;
-    const std::string& get_menuName(void) const;
-
-    bool set_menuID(unsigned int menuID_);
-    void reset_position(void);
-    bool set_position(unsigned int position_);
-    bool set_menuName(const std::string& menuName_);
-
-  private:
-  
-    friend class AddSubMenu_requestMarshaller;
-
-
-///  unique ID of the sub menu to add.
-      unsigned int menuID;	//!<  (0,2000000000)
-
-/**
-     Position within the items that are are at top level of the in application menu.
-     0 will insert at the front.
-     1 will insert at the second position.
-     If position is greater or equal than the number of items on top level, the sub menu will be appended to the end.
-     Position of any submenu will always be located before the return and exit options
-     If this param was omitted the entry will be added at the end.
-*/
-      unsigned int* position;	//!<  (0,1000)
-
-///  Text to show in the menu for this sub menu.
-      std::string menuName;	//!< (500)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AddSubMenu_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AddSubMenu_response.h
deleted file mode 100644
index 9fae3f7e9..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AddSubMenu_response.h
+++ /dev/null
@@ -1,65 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_ADDSUBMENU_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_ADDSUBMENU_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    class AddSubMenu_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        AddSubMenu_response(const AddSubMenu_response& c);
-        AddSubMenu_response(void);
-
-        virtual ~AddSubMenu_response(void);
-
-        AddSubMenu_response& operator =(const AddSubMenu_response&);
-
-        bool checkIntegrity(void);
-    private:
-        friend class AddSubMenu_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AlertManeuver_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AlertManeuver_request.h
deleted file mode 100644
index b90a77f4c..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AlertManeuver_request.h
+++ /dev/null
@@ -1,86 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_ALERTMANEUVER_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_ALERTMANEUVER_REQUEST_INCLUDE
-
-#include <vector>
-
-#include "SoftButton.h"
-#include "TTSChunk.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  class AlertManeuver_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    AlertManeuver_request(const AlertManeuver_request& c);
-    AlertManeuver_request(void);
-    
-    virtual ~AlertManeuver_request(void);
-  
-    bool checkIntegrity(void);
-
-    const std::vector<TTSChunk>& get_ttsChunks(void) const;
-    const std::vector<SoftButton>& get_softButtons(void) const;
-
-    bool set_ttsChunks(const std::vector<TTSChunk>& ttsChunks_);
-    bool set_softButtons(const std::vector<SoftButton>& softButtons_);
-
-  private:
-  
-    friend class AlertManeuver_requestMarshaller;
-
-
-///  An array of text chunks of type TTSChunk. See TTSChunk
-      std::vector<TTSChunk> ttsChunks;	//!<   [%s..%s] 
-
-///  If omitted on supported displays, only the system defined "Close" SoftButton shall be displayed.
-      std::vector<SoftButton> softButtons;	//!<   [%s..%s] 
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AlertManeuver_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AlertManeuver_response.h
deleted file mode 100644
index cbcfbecd6..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AlertManeuver_response.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_ALERTMANEUVER_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_ALERTMANEUVER_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    class AlertManeuver_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        AlertManeuver_response(const AlertManeuver_response& c);
-        AlertManeuver_response(void);
-
-        virtual ~AlertManeuver_response(void);
-
-        AlertManeuver_response& operator =(const AlertManeuver_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class AlertManeuver_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Alert_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Alert_request.h
deleted file mode 100644
index fe622c808..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Alert_request.h
+++ /dev/null
@@ -1,136 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_ALERT_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_ALERT_REQUEST_INCLUDE
-
-#include <vector>
-#include <string>
-
-#include "SoftButton.h"
-#include "TTSChunk.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Shows an alert which typically consists of text-to-speech message and text on the display. At least either alertText1, alertText2 or TTSChunks need to be provided.
-
-  class Alert_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    Alert_request(const Alert_request& c);
-    Alert_request(void);
-    
-    virtual ~Alert_request(void);
-  
-    Alert_request& operator =(const Alert_request&);
-  
-    bool checkIntegrity(void);
-
-    const std::string* get_alertText1(void) const;
-    const std::string* get_alertText2(void) const;
-    const std::string* get_alertText3(void) const;
-    const std::vector<TTSChunk>* get_ttsChunks(void) const;
-    const unsigned int* get_duration(void) const;
-    const bool* get_playTone(void) const;
-    const std::vector<SoftButton>* get_softButtons(void) const;
-
-    void reset_alertText1(void);
-    bool set_alertText1(const std::string& alertText1_);
-    void reset_alertText2(void);
-    bool set_alertText2(const std::string& alertText2_);
-    void reset_alertText3(void);
-    bool set_alertText3(const std::string& alertText3_);
-    void reset_ttsChunks(void);
-    bool set_ttsChunks(const std::vector<TTSChunk>& ttsChunks_);
-    void reset_duration(void);
-    bool set_duration(unsigned int duration_);
-    void reset_playTone(void);
-    bool set_playTone(bool playTone_);
-    void reset_softButtons(void);
-    bool set_softButtons(const std::vector<SoftButton>& softButtons_);
-
-  private:
-  
-    friend class Alert_requestMarshaller;
-
-
-///  The first line of the alert text field
-      std::string* alertText1;	//!< (500)
-
-///  The second line of the alert text field
-      std::string* alertText2;	//!< (500)
-
-///  The optional third line of the alert text field
-      std::string* alertText3;	//!< (500)
-
-/**
-     An array of text chunks of type TTSChunk. See TTSChunk
-     The array must have at least one item
-*/
-      std::vector<TTSChunk>* ttsChunks;	//!<   [%s..%s] 
-
-/**
-     Timeout in milliseconds.
-     Typical timeouts are 3-5 seconds
-     If omitted, timeout is set to 5s.
-*/
-      unsigned int* duration;	//!<  (3000,10000)
-
-/**
-     Defines if tone should be played. Tone is played before TTS.
-     If omitted, no tone is played.
-*/
-      bool* playTone;
-
-/**
-     App defined SoftButtons.
-     If omitted on supported displays, the displayed alert shall not have any SoftButtons.
-*/
-      std::vector<SoftButton>* softButtons;	//!<   [%s..%s] 
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Alert_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Alert_response.h
deleted file mode 100644
index 4f21d4dd7..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Alert_response.h
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_ALERT_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_ALERT_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    class Alert_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        Alert_response(const Alert_response& c);
-        Alert_response(void);
-
-        virtual ~Alert_response(void);
-
-        Alert_response& operator =(const Alert_response&);
-
-        bool checkIntegrity(void);
-
-        unsigned int get_tryAgainTime(void) const;
-        bool set_tryAgainTime(unsigned int tryAgainTime_);
-
-    private:
-        friend class Alert_responseMarshaller;
-
-        /**
-             Amount of time (in seconds) that an app must wait before resending an alert.
-             If provided, another system event or overlay currently has a higher priority than this alert.
-             An app must not send an alert without waiting at least the amount of time dictated.
-        */
-        unsigned int tryAgainTime;    //!<  (0,2000000000)
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AppInterfaceUnregisteredReason.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AppInterfaceUnregisteredReason.h
deleted file mode 100644
index 2c41d2976..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AppInterfaceUnregisteredReason.h
+++ /dev/null
@@ -1,83 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_APPINTERFACEUNREGISTEREDREASON_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_APPINTERFACEUNREGISTEREDREASON_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Error code, which comes from sync side.
-
-  class AppInterfaceUnregisteredReason
-  {
-  public:
-    enum AppInterfaceUnregisteredReasonInternal
-    {
-      INVALID_ENUM=-1,
-      USER_EXIT=0,
-      IGNITION_OFF=1,
-      BLUETOOTH_OFF=2,
-      USB_DISCONNECTED=3,
-      REQUEST_WHILE_IN_NONE_HMI_LEVEL=4,
-      TOO_MANY_REQUESTS=5,
-      DRIVER_DISTRACTION_VIOLATION=6,
-      LANGUAGE_CHANGE=7,
-      MASTER_RESET=8,
-      FACTORY_DEFAULTS=9,
-      APP_UNAUTHORIZED=10
-    };
-  
-    AppInterfaceUnregisteredReason() : mInternal(INVALID_ENUM)				{}
-    AppInterfaceUnregisteredReason(AppInterfaceUnregisteredReasonInternal e) : mInternal(e)		{}
-  
-    AppInterfaceUnregisteredReasonInternal get(void) const	{ return mInternal; }
-    void set(AppInterfaceUnregisteredReasonInternal e)		{ mInternal=e; }
-  
-  private:
-    AppInterfaceUnregisteredReasonInternal mInternal;
-    friend class AppInterfaceUnregisteredReasonMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AppType.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AppType.h
deleted file mode 100644
index e2ad534fc..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AppType.h
+++ /dev/null
@@ -1,82 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_APPTYPE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_APPTYPE_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Enumeration listing possible app types.
-
-  class AppType
-  {
-  public:
-    enum AppTypeInternal
-    {
-      INVALID_ENUM=-1,
-      DEFAULT=0,
-      COMMUNICATION=1,
-      MEDIA=2,
-      MESSAGING=3,
-      NAVIGATION=4,
-      INFORMATION=5,
-      SOCIAL=6,
-      BACKGROUND_PROCESS=7,
-      TESTING=8,
-      SYSTEM=9
-    };
-  
-    AppType() : mInternal(INVALID_ENUM)				{}
-    AppType(AppTypeInternal e) : mInternal(e)		{}
-  
-    AppTypeInternal get(void) const	{ return mInternal; }
-    void set(AppTypeInternal e)		{ mInternal=e; }
-  
-  private:
-    AppTypeInternal mInternal;
-    friend class AppTypeMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AudioCaptureQuality.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AudioCaptureQuality.h
deleted file mode 100644
index d0f450b5a..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AudioCaptureQuality.h
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_AUDIOCAPTUREQUALITY_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_AUDIOCAPTUREQUALITY_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Describes different quality options for PerformAudioPassThru.
-
-  class AudioCaptureQuality
-  {
-  public:
-    enum AudioCaptureQualityInternal
-    {
-      INVALID_ENUM=-1,
-      FIX_8_BIT=0,
-      FIX_16_BIT=1
-    };
-  
-    AudioCaptureQuality() : mInternal(INVALID_ENUM)				{}
-    AudioCaptureQuality(AudioCaptureQualityInternal e) : mInternal(e)		{}
-  
-    AudioCaptureQualityInternal get(void) const	{ return mInternal; }
-    void set(AudioCaptureQualityInternal e)		{ mInternal=e; }
-  
-  private:
-    AudioCaptureQualityInternal mInternal;
-    friend class AudioCaptureQualityMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AudioStreamingState.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AudioStreamingState.h
deleted file mode 100644
index ea38725f8..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AudioStreamingState.h
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_AUDIOSTREAMINGSTATE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_AUDIOSTREAMINGSTATE_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Enumeraction that describes possible states of audio streaming.
-
-  class AudioStreamingState
-  {
-  public:
-    enum AudioStreamingStateInternal
-    {
-      INVALID_ENUM=-1,
-      AUDIBLE=0,
-      NOT_AUDIBLE=1,
-      ATTENUATED=2
-    };
-  
-    AudioStreamingState() : mInternal(INVALID_ENUM)				{}
-    AudioStreamingState(AudioStreamingStateInternal e) : mInternal(e)		{}
-  
-    AudioStreamingStateInternal get(void) const	{ return mInternal; }
-    void set(AudioStreamingStateInternal e)		{ mInternal=e; }
-  
-  private:
-    AudioStreamingStateInternal mInternal;
-    friend class AudioStreamingStateMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AudioType.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AudioType.h
deleted file mode 100644
index af491c9a2..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/AudioType.h
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_AUDIOTYPE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_AUDIOTYPE_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Describes different audio type options for PerformAudioPassThru.
-
-  class AudioType
-  {
-  public:
-    enum AudioTypeInternal
-    {
-      INVALID_ENUM=-1,
-      PCM=0
-    };
-  
-    AudioType() : mInternal(INVALID_ENUM)				{}
-    AudioType(AudioTypeInternal e) : mInternal(e)		{}
-  
-    AudioTypeInternal get(void) const	{ return mInternal; }
-    void set(AudioTypeInternal e)		{ mInternal=e; }
-  
-  private:
-    AudioTypeInternal mInternal;
-    friend class AudioTypeMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ButtonCapabilities.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ButtonCapabilities.h
deleted file mode 100644
index b586a534f..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ButtonCapabilities.h
+++ /dev/null
@@ -1,107 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_BUTTONCAPABILITIES_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_BUTTONCAPABILITIES_INCLUDE
-
-
-#include "ButtonName.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Contains information about a button's capabilities.
-
-  class ButtonCapabilities
-  {
-  public:
-  
-    ButtonCapabilities(const ButtonCapabilities& c);
-    ButtonCapabilities(void);
-  
-    bool checkIntegrity(void);
-  // getters
-
-    bool get_longPressAvailable(void) const;
-    const ButtonName& get_name(void) const;
-    bool get_shortPressAvailable(void) const;
-    bool get_upDownAvailable(void) const;
-
-// setters
-
-    bool set_longPressAvailable(bool longPressAvailable_);
-    bool set_name(const ButtonName& name_);
-    bool set_shortPressAvailable(bool shortPressAvailable_);
-    bool set_upDownAvailable(bool upDownAvailable_);
-
-  private:
-
-    friend class ButtonCapabilitiesMarshaller;
-
-
-/**
-     The button supports a LONG press.
-     Whenever the button is pressed long, onButtonPressed( LONG) will be invoked.
-*/
-      bool longPressAvailable;
-
-///  The name of the button. See ButtonName.
-      ButtonName name;
-
-/**
-     The button supports a short press.
-     Whenever the button is pressed short, onButtonPressed( SHORT) will be invoked.
-*/
-      bool shortPressAvailable;
-
-/**
-     The button supports "button down" and "button up".
-     Whenever the button is pressed, onButtonEvent( DOWN) will be invoked.
-     Whenever the button is released, onButtonEvent( UP) will be invoked.
-*/
-      bool upDownAvailable;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ButtonEventMode.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ButtonEventMode.h
deleted file mode 100644
index 6be407921..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ButtonEventMode.h
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_BUTTONEVENTMODE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_BUTTONEVENTMODE_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  class ButtonEventMode
-  {
-  public:
-    enum ButtonEventModeInternal
-    {
-      INVALID_ENUM=-1,
-
-///  A button has been released up
-      BUTTONUP=0,
-
-///  A button has been pressed down
-      BUTTONDOWN=1
-    };
-  
-    ButtonEventMode() : mInternal(INVALID_ENUM)				{}
-    ButtonEventMode(ButtonEventModeInternal e) : mInternal(e)		{}
-  
-    ButtonEventModeInternal get(void) const	{ return mInternal; }
-    void set(ButtonEventModeInternal e)		{ mInternal=e; }
-  
-  private:
-    ButtonEventModeInternal mInternal;
-    friend class ButtonEventModeMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ButtonName.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ButtonName.h
deleted file mode 100644
index 457a1fc43..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ButtonName.h
+++ /dev/null
@@ -1,88 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_BUTTONNAME_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_BUTTONNAME_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Defines the hard (physical) and soft (touchscreen) buttons available from SYNC
-
-  class ButtonName
-  {
-  public:
-    enum ButtonNameInternal
-    {
-      INVALID_ENUM=-1,
-      OK=0,
-      SEEKLEFT=1,
-      SEEKRIGHT=2,
-      TUNEUP=3,
-      TUNEDOWN=4,
-      PRESET_0=5,
-      PRESET_1=6,
-      PRESET_2=7,
-      PRESET_3=8,
-      PRESET_4=9,
-      PRESET_5=10,
-      PRESET_6=11,
-      PRESET_7=12,
-      PRESET_8=13,
-      PRESET_9=14,
-      CUSTOM_BUTTON=15
-    };
-  
-    ButtonName() : mInternal(INVALID_ENUM)				{}
-    ButtonName(ButtonNameInternal e) : mInternal(e)		{}
-  
-    ButtonNameInternal get(void) const	{ return mInternal; }
-    void set(ButtonNameInternal e)		{ mInternal=e; }
-  
-  private:
-    ButtonNameInternal mInternal;
-    friend class ButtonNameMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ButtonPressMode.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ButtonPressMode.h
deleted file mode 100644
index cbafb96b1..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ButtonPressMode.h
+++ /dev/null
@@ -1,82 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_BUTTONPRESSMODE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_BUTTONPRESSMODE_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  class ButtonPressMode
-  {
-  public:
-    enum ButtonPressModeInternal
-    {
-      INVALID_ENUM=-1,
-
-/**
-     A button was released, after it was pressed for a long time
-     Actual timing is defined by Sync and may vary
-*/
-      LONG=0,
-
-/**
-     A button was released, after it was pressed for a short time
-     Actual timing is defined by Sync and may vary
-*/
-      SHORT=1
-    };
-  
-    ButtonPressMode() : mInternal(INVALID_ENUM)				{}
-    ButtonPressMode(ButtonPressModeInternal e) : mInternal(e)		{}
-  
-    ButtonPressModeInternal get(void) const	{ return mInternal; }
-    void set(ButtonPressModeInternal e)		{ mInternal=e; }
-  
-  private:
-    ButtonPressModeInternal mInternal;
-    friend class ButtonPressModeMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ChangeRegistration_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ChangeRegistration_request.h
deleted file mode 100644
index 820e1bedc..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ChangeRegistration_request.h
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_CHANGEREGISTRATION_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_CHANGEREGISTRATION_REQUEST_INCLUDE
-
-
-#include "Language.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  class ChangeRegistration_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    ChangeRegistration_request(const ChangeRegistration_request& c);
-    ChangeRegistration_request(void);
-    
-    virtual ~ChangeRegistration_request(void);
-  
-    bool checkIntegrity(void);
-
-    const Language& get_language(void) const;
-    const Language& get_hmiDisplayLanguage(void) const;
-
-    bool set_language(const Language& language_);
-    bool set_hmiDisplayLanguage(const Language& hmiDisplayLanguage_);
-
-  private:
-  
-    friend class ChangeRegistration_requestMarshaller;
-
-
-///  Requested SYNC voice engine (VR+TTS) language registration
-      Language language;
-
-///  Request display language registration
-      Language hmiDisplayLanguage;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ChangeRegistration_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ChangeRegistration_response.h
deleted file mode 100644
index 42f2596fd..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ChangeRegistration_response.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_CHANGEREGISTRATION_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_CHANGEREGISTRATION_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    class ChangeRegistration_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        ChangeRegistration_response(const ChangeRegistration_response& c);
-        ChangeRegistration_response(void);
-
-        virtual ~ChangeRegistration_response(void);
-
-        ChangeRegistration_response& operator =(const ChangeRegistration_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class ChangeRegistration_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/CharacterSet.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/CharacterSet.h
deleted file mode 100644
index 8d3f54424..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/CharacterSet.h
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_CHARACTERSET_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_CHARACTERSET_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  The list of potential character sets
-
-  class CharacterSet
-  {
-  public:
-    enum CharacterSetInternal
-    {
-      INVALID_ENUM=-1,
-
-///  See [@TODO: create file ref]
-      TYPE2SET=0,
-
-///  See [@TODO: create file ref]
-      TYPE5SET=1,
-
-///  See [@TODO: create file ref]
-      CID1SET=2,
-
-///  See [@TODO: create file ref]
-      CID2SET=3
-    };
-  
-    CharacterSet() : mInternal(INVALID_ENUM)				{}
-    CharacterSet(CharacterSetInternal e) : mInternal(e)		{}
-  
-    CharacterSetInternal get(void) const	{ return mInternal; }
-    void set(CharacterSetInternal e)		{ mInternal=e; }
-  
-  private:
-    CharacterSetInternal mInternal;
-    friend class CharacterSetMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Choice.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Choice.h
deleted file mode 100644
index cb3121398..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Choice.h
+++ /dev/null
@@ -1,91 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_CHOICE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_CHOICE_INCLUDE
-
-#include <string>
-#include <vector>
-
-#include "Image.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  A choice is an option given to the user, which can be selected either by menu, or through voice recognition system.
-
-  class Choice
-  {
-  public:
-  
-    Choice(const Choice& c);
-    Choice(void);
-  
-    bool checkIntegrity(void);
-  // getters
-
-    unsigned int get_choiceID(void) const;
-    const Image& get_image(void) const;
-    const std::string& get_menuName(void) const;
-    const std::vector<std::string>& get_vrCommands(void) const;
-
-// setters
-
-    bool set_choiceID(unsigned int choiceID_);
-    bool set_image(const Image& image_);
-    bool set_menuName(const std::string& menuName_);
-    bool set_vrCommands(const std::vector<std::string>& vrCommands_);
-
-  private:
-
-    friend class ChoiceMarshaller;
-
-      unsigned int choiceID;	//!<  (0,65535)
-      Image image;
-      std::string menuName;	//!< (500)
-      std::vector<std::string> vrCommands;	//!<   [%s..%s] (99)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/CompassDirection.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/CompassDirection.h
deleted file mode 100644
index f420da0fe..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/CompassDirection.h
+++ /dev/null
@@ -1,80 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_COMPASSDIRECTION_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_COMPASSDIRECTION_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  The list of potential compass directions
-
-  class CompassDirection
-  {
-  public:
-    enum CompassDirectionInternal
-    {
-      INVALID_ENUM=-1,
-      NORTH=0,
-      NORTHWEST=1,
-      WEST=2,
-      SOUTHWEST=3,
-      SOUTH=4,
-      SOUTHEAST=5,
-      EAST=6,
-      NORTHEAST=7
-    };
-  
-    CompassDirection() : mInternal(INVALID_ENUM)				{}
-    CompassDirection(CompassDirectionInternal e) : mInternal(e)		{}
-  
-    CompassDirectionInternal get(void) const	{ return mInternal; }
-    void set(CompassDirectionInternal e)		{ mInternal=e; }
-  
-  private:
-    CompassDirectionInternal mInternal;
-    friend class CompassDirectionMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/CreateInteractionChoiceSet_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/CreateInteractionChoiceSet_request.h
deleted file mode 100644
index 2a50bb47f..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/CreateInteractionChoiceSet_request.h
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_CREATEINTERACTIONCHOICESET_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_CREATEINTERACTIONCHOICESET_REQUEST_INCLUDE
-
-#include <vector>
-
-#include "Choice.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  creates interaction choice set to be used later by performInteraction
-
-  class CreateInteractionChoiceSet_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    CreateInteractionChoiceSet_request(const CreateInteractionChoiceSet_request& c);
-    CreateInteractionChoiceSet_request(void);
-    
-    virtual ~CreateInteractionChoiceSet_request(void);
-  
-    bool checkIntegrity(void);
-
-    unsigned int get_interactionChoiceSetID(void) const;
-    const std::vector<Choice>& get_choiceSet(void) const;
-
-    bool set_interactionChoiceSetID(unsigned int interactionChoiceSetID_);
-    bool set_choiceSet(const std::vector<Choice>& choiceSet_);
-
-  private:
-  
-    friend class CreateInteractionChoiceSet_requestMarshaller;
-
-
-///  Unique ID used for this interaction choice set.
-      unsigned int interactionChoiceSetID;	//!<  (0,2000000000)
-      std::vector<Choice> choiceSet;	//!<   [%s..%s] 
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/CreateInteractionChoiceSet_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/CreateInteractionChoiceSet_response.h
deleted file mode 100644
index 0ff5edb1d..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/CreateInteractionChoiceSet_response.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_CREATEINTERACTIONCHOICESET_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_CREATEINTERACTIONCHOICESET_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    class CreateInteractionChoiceSet_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        CreateInteractionChoiceSet_response(const CreateInteractionChoiceSet_response& c);
-        CreateInteractionChoiceSet_response(void);
-
-        virtual ~CreateInteractionChoiceSet_response(void);
-
-        CreateInteractionChoiceSet_response& operator =(const CreateInteractionChoiceSet_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class CreateInteractionChoiceSet_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DTC.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DTC.h
deleted file mode 100644
index 6f9a6f84b..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DTC.h
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_DTC_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_DTC_INCLUDE
-
-#include <string>
-
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  class DTC
-  {
-  public:
-  
-    DTC(const DTC& c);
-    DTC(void);
-  
-    bool checkIntegrity(void);
-  // getters
-
-    const std::string& get_identifier(void) const;
-    const std::string& get_statusByte(void) const;
-
-// setters
-
-    bool set_identifier(const std::string& identifier_);
-    bool set_statusByte(const std::string& statusByte_);
-
-  private:
-
-    friend class DTCMarshaller;
-
-
-///  String containing hexadecimal identifier as well as other common names.
-      std::string identifier;	//!< (500)
-
-///  Hexadecimal byte string.
-      std::string statusByte;	//!< (500)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DeactivateReason.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DeactivateReason.h
deleted file mode 100644
index 37e975ffb..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DeactivateReason.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_DEACTIVATEREASON_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_DEACTIVATEREASON_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Enum of reasons of user navigating from application used by HMI.
-
-  class DeactivateReason
-  {
-  public:
-    enum DeactivateReasonInternal
-    {
-      INVALID_ENUM=-1,
-
-///  Navigated to audio(radio, etc)
-      AUDIO=0,
-
-///  Navigated to make a call.
-      PHONECALL=1,
-
-///  Navigated to navigation screen.
-      NAVIGATIONMAP=2,
-
-///  Navigated to phone menu.
-      PHONEMENU=3,
-
-///  Navigated to settings menu.
-      SYNCSETTINGS=4,
-
-///  Other screens navigation apart from other mobile app.
-      GENERAL=5
-    };
-  
-    DeactivateReason() : mInternal(INVALID_ENUM)				{}
-    DeactivateReason(DeactivateReasonInternal e) : mInternal(e)		{}
-  
-    DeactivateReasonInternal get(void) const	{ return mInternal; }
-    void set(DeactivateReasonInternal e)		{ mInternal=e; }
-  
-  private:
-    DeactivateReasonInternal mInternal;
-    friend class DeactivateReasonMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DeleteCommand_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DeleteCommand_request.h
deleted file mode 100644
index 78b64d36f..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DeleteCommand_request.h
+++ /dev/null
@@ -1,80 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_DELETECOMMAND_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_DELETECOMMAND_REQUEST_INCLUDE
-
-
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Deletes all commands from the in-application menu with the specified command id.
-
-  class DeleteCommand_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    DeleteCommand_request(const DeleteCommand_request& c);
-    DeleteCommand_request(void);
-    
-    virtual ~DeleteCommand_request(void);
-  
-    bool checkIntegrity(void);
-
-    unsigned int get_cmdID(void) const;
-
-    bool set_cmdID(unsigned int cmdID_);
-
-  private:
-  
-    friend class DeleteCommand_requestMarshaller;
-
-
-///  ID of the command(s) to delete.
-      unsigned int cmdID;	//!<  (0,2000000000)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DeleteCommand_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DeleteCommand_response.h
deleted file mode 100644
index ba703bac8..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DeleteCommand_response.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_DELETECOMMAND_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_DELETECOMMAND_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    class DeleteCommand_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        DeleteCommand_response(const DeleteCommand_response& c);
-        DeleteCommand_response(void);
-
-        virtual ~DeleteCommand_response(void);
-
-        DeleteCommand_response& operator =(const DeleteCommand_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class DeleteCommand_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DeleteFile_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DeleteFile_request.h
deleted file mode 100644
index 3d5f55f57..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DeleteFile_request.h
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_DELETEFILE_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_DELETEFILE_REQUEST_INCLUDE
-
-#include <string>
-
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-/**
-     Used to delete a file resident on the SYNC module in the app's local cache.
-     Not supported on first generation SYNC vehicles. 
-*/
-
-  class DeleteFile_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    DeleteFile_request(const DeleteFile_request& c);
-    DeleteFile_request(void);
-    
-    virtual ~DeleteFile_request(void);
-  
-    bool checkIntegrity(void);
-
-    const std::string& get_syncFileName(void) const;
-
-    bool set_syncFileName(const std::string& syncFileName_);
-
-  private:
-  
-    friend class DeleteFile_requestMarshaller;
-
-
-///  File reference name.
-      std::string syncFileName;	//!< (500)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DeleteFile_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DeleteFile_response.h
deleted file mode 100644
index 3cd08d818..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DeleteFile_response.h
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_DELETEFILE_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_DELETEFILE_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    /**
-         Response is sent, when the file data was deleted (success case). Or when an error occured.
-         Not supported on First generation SYNC vehicles.
-    */
-    class DeleteFile_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        DeleteFile_response(const DeleteFile_response& c);
-        DeleteFile_response(void);
-
-        virtual ~DeleteFile_response(void);
-
-        DeleteFile_response& operator =(const DeleteFile_response&);
-
-        bool checkIntegrity(void);
-
-        unsigned int get_spaceAvailable(void) const;
-        bool set_spaceAvailable(unsigned int spaceAvailable_);
-
-    private:
-        friend class DeleteFile_responseMarshaller;
-
-        ///  Provides the total local space available on SYNC for the registered app.
-        unsigned int spaceAvailable;  //!<  (0,2000000000)
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DeleteInteractionChoiceSet_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DeleteInteractionChoiceSet_request.h
deleted file mode 100644
index a94379166..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DeleteInteractionChoiceSet_request.h
+++ /dev/null
@@ -1,83 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_DELETEINTERACTIONCHOICESET_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_DELETEINTERACTIONCHOICESET_REQUEST_INCLUDE
-
-
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-/**
-     Deletes interaction choice set that has been created with "CreateInteractionChoiceSet".
-     The interaction may only be deleted when not currently in use by a "performInteraction".
-*/
-
-  class DeleteInteractionChoiceSet_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    DeleteInteractionChoiceSet_request(const DeleteInteractionChoiceSet_request& c);
-    DeleteInteractionChoiceSet_request(void);
-    
-    virtual ~DeleteInteractionChoiceSet_request(void);
-  
-    bool checkIntegrity(void);
-
-    unsigned int get_interactionChoiceSetID(void) const;
-
-    bool set_interactionChoiceSetID(unsigned int interactionChoiceSetID_);
-
-  private:
-  
-    friend class DeleteInteractionChoiceSet_requestMarshaller;
-
-
-///  ID of the interaction choice set to delete.
-      unsigned int interactionChoiceSetID;	//!<  (0,2000000000)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DeleteInteractionChoiceSet_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DeleteInteractionChoiceSet_response.h
deleted file mode 100644
index 814b34139..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DeleteInteractionChoiceSet_response.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_DELETEINTERACTIONCHOICESET_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_DELETEINTERACTIONCHOICESET_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    class DeleteInteractionChoiceSet_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        DeleteInteractionChoiceSet_response(const DeleteInteractionChoiceSet_response& c);
-        DeleteInteractionChoiceSet_response(void);
-
-        virtual ~DeleteInteractionChoiceSet_response(void);
-
-        DeleteInteractionChoiceSet_response& operator =(const DeleteInteractionChoiceSet_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class DeleteInteractionChoiceSet_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DeleteSubMenu_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DeleteSubMenu_request.h
deleted file mode 100644
index 4cca49b0a..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DeleteSubMenu_request.h
+++ /dev/null
@@ -1,80 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_DELETESUBMENU_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_DELETESUBMENU_REQUEST_INCLUDE
-
-
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Deletes a submenu from the in-application menu.
-
-  class DeleteSubMenu_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    DeleteSubMenu_request(const DeleteSubMenu_request& c);
-    DeleteSubMenu_request(void);
-    
-    virtual ~DeleteSubMenu_request(void);
-  
-    bool checkIntegrity(void);
-
-    unsigned int get_menuID(void) const;
-
-    bool set_menuID(unsigned int menuID_);
-
-  private:
-  
-    friend class DeleteSubMenu_requestMarshaller;
-
-
-///  The "menuID" of the submenu to delete. (See addSubMenu.menuID)
-      unsigned int menuID;	//!<  (0,2000000000)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DeleteSubMenu_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DeleteSubMenu_response.h
deleted file mode 100644
index 585da435a..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DeleteSubMenu_response.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_DELETESUBMENU_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_DELETESUBMENU_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    class DeleteSubMenu_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        DeleteSubMenu_response(const DeleteSubMenu_response& c);
-        DeleteSubMenu_response(void);
-
-        virtual ~DeleteSubMenu_response(void);
-
-        DeleteSubMenu_response& operator =(const DeleteSubMenu_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class DeleteSubMenu_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DialNumber_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DialNumber_request.h
deleted file mode 100644
index 329369979..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DialNumber_request.h
+++ /dev/null
@@ -1,81 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_DIALNUMBER_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_DIALNUMBER_REQUEST_INCLUDE
-
-#include <string>
-
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Dials a phone number and switches to phone application.
-
-  class DialNumber_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    DialNumber_request(const DialNumber_request& c);
-    DialNumber_request(void);
-    
-    virtual ~DialNumber_request(void);
-  
-    bool checkIntegrity(void);
-
-    const std::string& get_number(void) const;
-
-    bool set_number(const std::string& number_);
-
-  private:
-  
-    friend class DialNumber_requestMarshaller;
-
-
-///  Phone number is a string consisting of only the digits and "+", which can be up to 40 chars.
-      std::string number;	//!< (500)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DialNumber_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DialNumber_response.h
deleted file mode 100644
index 30f9756d4..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DialNumber_response.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_DIALNUMBER_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_DIALNUMBER_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    class DialNumber_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        DialNumber_response(const DialNumber_response& c);
-        DialNumber_response(void);
-
-        virtual ~DialNumber_response(void);
-
-        DialNumber_response& operator =(const DialNumber_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class DialNumber_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Dimension.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Dimension.h
deleted file mode 100644
index 6780ae042..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Dimension.h
+++ /dev/null
@@ -1,81 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_DIMENSION_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_DIMENSION_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  The supported dimensions of the GPS
-
-  class Dimension
-  {
-  public:
-    enum DimensionInternal
-    {
-      INVALID_ENUM=-1,
-
-///  No GPS at all
-      NO_FIX=0,
-
-///  Longitude and lattitude
-      FIX_2D=1,
-
-///  Longitude and lattitude and altitude
-      FIX_3D=2
-    };
-  
-    Dimension() : mInternal(INVALID_ENUM)				{}
-    Dimension(DimensionInternal e) : mInternal(e)		{}
-  
-    DimensionInternal get(void) const	{ return mInternal; }
-    void set(DimensionInternal e)		{ mInternal=e; }
-  
-  private:
-    DimensionInternal mInternal;
-    friend class DimensionMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DisplayCapabilities.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DisplayCapabilities.h
deleted file mode 100644
index 65864a766..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DisplayCapabilities.h
+++ /dev/null
@@ -1,95 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_DISPLAYCAPABILITIES_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_DISPLAYCAPABILITIES_INCLUDE
-
-#include <vector>
-
-#include "DisplayType.h"
-#include "MediaClockFormat.h"
-#include "TextField.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Contains information about the display capabilities.
-
-  class DisplayCapabilities
-  {
-  public:
-  
-    DisplayCapabilities(const DisplayCapabilities& c);
-    DisplayCapabilities(void);
-  
-    bool checkIntegrity(void);
-  // getters
-
-    const DisplayType& get_displayType(void) const;
-    const std::vector<MediaClockFormat>& get_mediaClockFormats(void) const;
-    const std::vector<TextField>& get_textFields(void) const;
-
-// setters
-
-    bool set_displayType(const DisplayType& displayType_);
-    bool set_mediaClockFormats(const std::vector<MediaClockFormat>& mediaClockFormats_);
-    bool set_textFields(const std::vector<TextField>& textFields_);
-
-  private:
-
-    friend class DisplayCapabilitiesMarshaller;
-
-
-///  The type of the display. See DisplayType
-      DisplayType displayType;
-
-///  A set of all supported formats of the media clock. See MediaClockFormat
-      std::vector<MediaClockFormat> mediaClockFormats;	//!<   [%s..%s] 
-
-///  A set of all fields that support text data. See TextField
-      std::vector<TextField> textFields;	//!<   [%s..%s] 
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DisplayType.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DisplayType.h
deleted file mode 100644
index fd5578e8c..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DisplayType.h
+++ /dev/null
@@ -1,81 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_DISPLAYTYPE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_DISPLAYTYPE_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  See DAES for further infos regarding the displays
-
-  class DisplayType
-  {
-  public:
-    enum DisplayTypeInternal
-    {
-      INVALID_ENUM=-1,
-      CID=0,
-      TYPE2=1,
-      TYPE5=2,
-      NGN=3,
-      GEN2_8_DMA=4,
-      GEN2_6_DMA=5,
-      MFD3=6,
-      MFD4=7,
-      MFD5=8
-    };
-  
-    DisplayType() : mInternal(INVALID_ENUM)				{}
-    DisplayType(DisplayTypeInternal e) : mInternal(e)		{}
-  
-    DisplayTypeInternal get(void) const	{ return mInternal; }
-    void set(DisplayTypeInternal e)		{ mInternal=e; }
-  
-  private:
-    DisplayTypeInternal mInternal;
-    friend class DisplayTypeMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DriverDistractionState.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DriverDistractionState.h
deleted file mode 100644
index 6f399db6f..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/DriverDistractionState.h
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_DRIVERDISTRACTIONSTATE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_DRIVERDISTRACTIONSTATE_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Enumeration that describes possible states of driver distraction.
-
-  class DriverDistractionState
-  {
-  public:
-    enum DriverDistractionStateInternal
-    {
-      INVALID_ENUM=-1,
-      DD_ON=0,
-      DD_OFF=1
-    };
-  
-    DriverDistractionState() : mInternal(INVALID_ENUM)				{}
-    DriverDistractionState(DriverDistractionStateInternal e) : mInternal(e)		{}
-  
-    DriverDistractionStateInternal get(void) const	{ return mInternal; }
-    void set(DriverDistractionStateInternal e)		{ mInternal=e; }
-  
-  private:
-    DriverDistractionStateInternal mInternal;
-    friend class DriverDistractionStateMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/EncodedSyncPData_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/EncodedSyncPData_request.h
deleted file mode 100644
index 895e91505..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/EncodedSyncPData_request.h
+++ /dev/null
@@ -1,82 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_ENCODEDSYNCPDATA_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_ENCODEDSYNCPDATA_REQUEST_INCLUDE
-
-#include <vector>
-#include <string>
-
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Allows encoded data in the form of SyncP packets to be sent to the SYNC module
-
-  class EncodedSyncPData_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    EncodedSyncPData_request(const EncodedSyncPData_request& c);
-    EncodedSyncPData_request(void);
-    
-    virtual ~EncodedSyncPData_request(void);
-  
-    bool checkIntegrity(void);
-
-    const std::vector<std::string>& get_data(void) const;
-
-    bool set_data(const std::vector<std::string>& data_);
-
-  private:
-  
-    friend class EncodedSyncPData_requestMarshaller;
-
-
-///  Contains base64 encoded string of SyncP packets.
-      std::vector<std::string> data;	//!<   [%s..%s] (10000)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/EncodedSyncPData_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/EncodedSyncPData_response.h
deleted file mode 100644
index a305c30e9..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/EncodedSyncPData_response.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_ENCODEDSYNCPDATA_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_ENCODEDSYNCPDATA_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    class EncodedSyncPData_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        EncodedSyncPData_response(const EncodedSyncPData_response& c);
-        EncodedSyncPData_response(void);
-
-        virtual ~EncodedSyncPData_response(void);
-
-        EncodedSyncPData_response& operator =(const EncodedSyncPData_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class EncodedSyncPData_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/EndAudioPassThru_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/EndAudioPassThru_request.h
deleted file mode 100644
index 4c66659ef..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/EndAudioPassThru_request.h
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_ENDAUDIOPASSTHRU_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_ENDAUDIOPASSTHRU_REQUEST_INCLUDE
-
-
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  When this request is invoked, the audio capture stops.
-
-  class EndAudioPassThru_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    EndAudioPassThru_request(const EndAudioPassThru_request& c);
-    EndAudioPassThru_request(void);
-    
-    virtual ~EndAudioPassThru_request(void);
-  
-    bool checkIntegrity(void);
-
-
-
-  private:
-  
-    friend class EndAudioPassThru_requestMarshaller;
-
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/EndAudioPassThru_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/EndAudioPassThru_response.h
deleted file mode 100644
index 59cab5d4d..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/EndAudioPassThru_response.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_ENDAUDIOPASSTHRU_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_ENDAUDIOPASSTHRU_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    class EndAudioPassThru_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        EndAudioPassThru_response(const EndAudioPassThru_response& c);
-        EndAudioPassThru_response(void);
-
-        virtual ~EndAudioPassThru_response(void);
-
-        EndAudioPassThru_response& operator =(const EndAudioPassThru_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class EndAudioPassThru_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/FileType.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/FileType.h
deleted file mode 100644
index c03a36273..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/FileType.h
+++ /dev/null
@@ -1,77 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_FILETYPE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_FILETYPE_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Enumeration listing possible file types.
-
-  class FileType
-  {
-  public:
-    enum FileTypeInternal
-    {
-      INVALID_ENUM=-1,
-      GRAPHIC_BMP=0,
-      GRAPHIC_JPEG=1,
-      GRAPHIC_PNG=2,
-      AUDIO_WAVE=3,
-      AUDIO_MP3=4
-    };
-  
-    FileType() : mInternal(INVALID_ENUM)				{}
-    FileType(FileTypeInternal e) : mInternal(e)		{}
-  
-    FileTypeInternal get(void) const	{ return mInternal; }
-    void set(FileTypeInternal e)		{ mInternal=e; }
-  
-  private:
-    FileTypeInternal mInternal;
-    friend class FileTypeMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/FunctionID.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/FunctionID.h
deleted file mode 100644
index c10a23942..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/FunctionID.h
+++ /dev/null
@@ -1,126 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_FUNCTIONID_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_FUNCTIONID_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-/**
-     Enumeration linking function names with function IDs in WiPro protocol.
-     Assumes enumeration starts at value 0.
-*/
-
-  class FunctionID
-  {
-  public:
-    enum FunctionIDInternal
-    {
-      INVALID_ENUM=-1,
-      RESERVED=0,
-      RegisterAppInterfaceID=1,
-      UnregisterAppInterfaceID=2,
-      SetGlobalPropertiesID=3,
-      ResetGlobalPropertiesID=4,
-      AddCommandID=5,
-      DeleteCommandID=6,
-      AddSubMenuID=7,
-      DeleteSubMenuID=8,
-      CreateInteractionChoiceSetID=9,
-      PerformInteractionID=10,
-      DeleteInteractionChoiceSetID=11,
-      AlertID=12,
-      ShowID=13,
-      SpeakID=14,
-      SetMediaClockTimerID=15,
-      EncodedSyncPDataID=16,
-      DialNumberID=17,
-      PerformAudioPassThruID=18,
-      EndAudioPassThruID=19,
-      SubscribeButtonID=20,
-      UnsubscribeButtonID=21,
-      SubscribeVehicleDataID=22,
-      UnsubscribeVehicleDataID=23,
-      GetVehicleDataID=24,
-      ReadDIDID=25,
-      GetDTCsID=26,
-      ScrollableMessageID=27,
-      SliderID=28,
-      ShowConstantTBTID=29,
-      AlertManeuverID=30,
-      UpdateTurnListID=31,
-      ChangeRegistrationID=32,
-      GenericResponseID=33,
-      PutFileID=34,
-      DeleteFileID=35,
-      ListFilesID=36,
-      SetAppIconID=37,
-      SetDisplayLayoutID=38,
-      OnHMIStatusID=39,
-      OnAppInterfaceUnregisteredID=40,
-      OnButtonEventID=41,
-      OnButtonPressID=42,
-      OnVehicleDataID=43,
-      OnCommandID=44,
-      OnEncodedSyncPDataID=45,
-      OnTBTClientStateID=46,
-      OnDriverDistractionID=47,
-      OnPermissionsChangeID=48,
-      OnAudioPassThruID=49,
-      OnLanguageChangeID=50
-    };
-  
-    FunctionID() : mInternal(INVALID_ENUM)				{}
-    FunctionID(FunctionIDInternal e) : mInternal(e)		{}
-  
-    FunctionIDInternal get(void) const	{ return mInternal; }
-    void set(FunctionIDInternal e)		{ mInternal=e; }
-  
-  private:
-    FunctionIDInternal mInternal;
-    friend class FunctionIDMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/GPSData.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/GPSData.h
deleted file mode 100644
index 6540b05eb..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/GPSData.h
+++ /dev/null
@@ -1,167 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_GPSDATA_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_GPSDATA_INCLUDE
-
-
-#include "CompassDirection.h"
-#include "Dimension.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Struct with the GPS data.
-
-  class GPSData
-  {
-  public:
-  
-    GPSData(const GPSData& c);
-    GPSData(void);
-  
-    bool checkIntegrity(void);
-  // getters
-
-    bool get_actual(void) const;
-    int get_altitude(void) const;
-    const CompassDirection& get_compassDirection(void) const;
-    const Dimension& get_dimension(void) const;
-    unsigned int get_hdop(void) const;
-    unsigned int get_heading(void) const;
-    int get_latitudeDegrees(void) const;
-    int get_longitudeDegrees(void) const;
-    unsigned int get_pdop(void) const;
-    unsigned int get_satellites(void) const;
-    unsigned int get_speed(void) const;
-    unsigned int get_utcDay(void) const;
-    unsigned int get_utcHours(void) const;
-    unsigned int get_utcMinutes(void) const;
-    unsigned int get_utcMonth(void) const;
-    unsigned int get_utcSeconds(void) const;
-    unsigned int get_utcYear(void) const;
-    unsigned int get_vdop(void) const;
-
-// setters
-
-    bool set_actual(bool actual_);
-    bool set_altitude(int altitude_);
-    bool set_compassDirection(const CompassDirection& compassDirection_);
-    bool set_dimension(const Dimension& dimension_);
-    bool set_hdop(unsigned int hdop_);
-    bool set_heading(unsigned int heading_);
-    bool set_latitudeDegrees(int latitudeDegrees_);
-    bool set_longitudeDegrees(int longitudeDegrees_);
-    bool set_pdop(unsigned int pdop_);
-    bool set_satellites(unsigned int satellites_);
-    bool set_speed(unsigned int speed_);
-    bool set_utcDay(unsigned int utcDay_);
-    bool set_utcHours(unsigned int utcHours_);
-    bool set_utcMinutes(unsigned int utcMinutes_);
-    bool set_utcMonth(unsigned int utcMonth_);
-    bool set_utcSeconds(unsigned int utcSeconds_);
-    bool set_utcYear(unsigned int utcYear_);
-    bool set_vdop(unsigned int vdop_);
-
-  private:
-
-    friend class GPSDataMarshaller;
-
-
-/**
-     True, if actual.
-     False, if infered.
-*/
-      bool actual;
-
-///  Altitude in meters
-      int altitude;	//!<  (-10000,10000)
-
-///  See CompassDirection.
-      CompassDirection compassDirection;
-
-///  See Dimension
-      Dimension dimension;
-
-///  HDOP.
-      unsigned int hdop;	//!<  (0,31)
-
-///  The heading. North is 0
-      unsigned int heading;	//!<  (0,360)
-      int latitudeDegrees;	//!<  (-1000000000,1000000000)
-      int longitudeDegrees;	//!<  (-1000000000,1000000000)
-
-///  PDOP.
-      unsigned int pdop;	//!<  (0,31)
-
-///  Number of satellites in view
-      unsigned int satellites;	//!<  (0,31)
-
-///  The speed in KPH
-      unsigned int speed;	//!<  (0,400)
-
-///  The current UTC day.
-      unsigned int utcDay;	//!<  (1,31)
-
-///  The current UTC hour.
-      unsigned int utcHours;	//!<  (0,23)
-
-///  The current UTC minute.
-      unsigned int utcMinutes;	//!<  (0,59)
-
-///  The current UTC month.
-      unsigned int utcMonth;	//!<  (1,12)
-
-///  The current UTC second.
-      unsigned int utcSeconds;	//!<  (0,59)
-
-///  The current UTC year.
-      unsigned int utcYear;	//!<  (2010,2100)
-
-///  VDOP.
-      unsigned int vdop;	//!<  (0,31)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/GenericResponse_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/GenericResponse_response.h
deleted file mode 100644
index ed58236d2..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/GenericResponse_response.h
+++ /dev/null
@@ -1,71 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_GENERICRESPONSE_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_GENERICRESPONSE_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    /**
-         Generic Response is sent, when the name of a received msg cannot be retrieved. Only used in case of an error.
-         Currently, only resultCode INVALID_DATA is used.
-    */
-    class GenericResponse_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        GenericResponse_response(const GenericResponse_response& c);
-        GenericResponse_response(void);
-
-        virtual ~GenericResponse_response(void);
-
-        GenericResponse_response& operator =(const GenericResponse_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class GenericResponse_responseMarshaller;
-    };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/GetDTCs_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/GetDTCs_request.h
deleted file mode 100644
index 895dbc7b2..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/GetDTCs_request.h
+++ /dev/null
@@ -1,92 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_GETDTCS_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_GETDTCS_REQUEST_INCLUDE
-
-
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Vehicle module diagnostic trouble code request.
-
-  class GetDTCs_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    GetDTCs_request(const GetDTCs_request& c);
-    GetDTCs_request(void);
-    
-    virtual ~GetDTCs_request(void);
-  
-    GetDTCs_request& operator =(const GetDTCs_request&);
-  
-    bool checkIntegrity(void);
-
-    unsigned int get_ecuName(void) const;
-    const bool* get_encrypted(void) const;
-
-    bool set_ecuName(unsigned int ecuName_);
-    void reset_encrypted(void);
-    bool set_encrypted(bool encrypted_);
-
-  private:
-  
-    friend class GetDTCs_requestMarshaller;
-
-
-///  Name of ECU.
-      unsigned int ecuName;	//!<  (0,65535)
-
-/**
-     If not provided, the default is equal to False"
-     Indicates if the DTC data requested should be returned as encrypted through an OnEncodedSYNCPData response.
-     If set to true, the data will return instead through OnEncodedSYNCPData and be passed through the proxy to the designated server URL.
-*/
-      bool* encrypted;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/GetDTCs_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/GetDTCs_response.h
deleted file mode 100644
index 8034f82d5..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/GetDTCs_response.h
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_GETDTCS_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_GETDTCS_RESPONSE_INCLUDE
-
-#include <vector>
-
-#include "DTC.h"
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    class GetDTCs_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        GetDTCs_response(const GetDTCs_response& c);
-        GetDTCs_response(void);
-
-        virtual ~GetDTCs_response(void);
-
-        GetDTCs_response& operator =(const GetDTCs_response&);
-
-        bool checkIntegrity(void);
-
-        const std::vector<DTC>* get_dtcList(void) const;
-        void reset_dtcList(void);
-        bool set_dtcList(const std::vector<DTC>& dtcList_);
-
-    private:
-        friend class GetDTCs_responseMarshaller;
-
-        ///  Array of all reported DTCs on module.
-        std::vector<DTC>* dtcList;    //!<   [%s..%s]
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/GetVehicleData_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/GetVehicleData_request.h
deleted file mode 100644
index e1d8598a5..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/GetVehicleData_request.h
+++ /dev/null
@@ -1,81 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_GETVEHICLEDATA_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_GETVEHICLEDATA_REQUEST_INCLUDE
-
-
-#include "VehicleDataType.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Non periodic vehicle data read request.
-
-  class GetVehicleData_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    GetVehicleData_request(const GetVehicleData_request& c);
-    GetVehicleData_request(void);
-    
-    virtual ~GetVehicleData_request(void);
-  
-    bool checkIntegrity(void);
-
-    const VehicleDataType& get_dataType(void) const;
-
-    bool set_dataType(const VehicleDataType& dataType_);
-
-  private:
-  
-    friend class GetVehicleData_requestMarshaller;
-
-
-///  Complex signals like "GPS" should not be transferred as separate notifications, but all together in one notification.
-      VehicleDataType dataType;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/GetVehicleData_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/GetVehicleData_response.h
deleted file mode 100644
index 90a8747cf..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/GetVehicleData_response.h
+++ /dev/null
@@ -1,193 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_GETVEHICLEDATA_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_GETVEHICLEDATA_RESPONSE_INCLUDE
-
-#include <string>
-
-#include "GPSData.h"
-#include "PRNDL.h"
-#include "TireStatus.h"
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    class GetVehicleData_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        GetVehicleData_response(const GetVehicleData_response& c);
-        GetVehicleData_response(void);
-
-        virtual ~GetVehicleData_response(void);
-
-        GetVehicleData_response& operator =(const GetVehicleData_response&);
-
-        bool checkIntegrity(void);
-
-        const GPSData* get_gps(void) const;
-        const float* get_speed(void) const;
-        const unsigned int* get_rpm(void) const;
-        const float* get_fuelLevel(void) const;
-        const float* get_avgFuelEconomy(void) const;
-        const float* get_batteryVoltage(void) const;
-        const float* get_externalTemperature(void) const;
-        const std::string* get_vin(void) const;
-        const PRNDL* get_prndl(void) const;
-        const TireStatus* get_tirePressure(void) const;
-        const float* get_batteryPackVoltage(void) const;
-        const float* get_batteryPackCurrent(void) const;
-        const int* get_batteryPackTemperature(void) const;
-        const int* get_engineTorque(void) const;
-        const unsigned int* get_odometer(void) const;
-        const unsigned int* get_tripOdometer(void) const;
-        const std::string* get_satRadioESN(void) const;
-
-        void reset_gps(void);
-        bool set_gps(const GPSData& gps_);
-        void reset_speed(void);
-        bool set_speed(float speed_);
-        void reset_rpm(void);
-        bool set_rpm(unsigned int rpm_);
-        void reset_fuelLevel(void);
-        bool set_fuelLevel(float fuelLevel_);
-        void reset_avgFuelEconomy(void);
-        bool set_avgFuelEconomy(float avgFuelEconomy_);
-        void reset_batteryVoltage(void);
-        bool set_batteryVoltage(float batteryVoltage_);
-        void reset_externalTemperature(void);
-        bool set_externalTemperature(float externalTemperature_);
-        void reset_vin(void);
-        bool set_vin(const std::string& vin_);
-        void reset_prndl(void);
-        bool set_prndl(const PRNDL& prndl_);
-        void reset_tirePressure(void);
-        bool set_tirePressure(const TireStatus& tirePressure_);
-        void reset_batteryPackVoltage(void);
-        bool set_batteryPackVoltage(float batteryPackVoltage_);
-        void reset_batteryPackCurrent(void);
-        bool set_batteryPackCurrent(float batteryPackCurrent_);
-        void reset_batteryPackTemperature(void);
-        bool set_batteryPackTemperature(int batteryPackTemperature_);
-        void reset_engineTorque(void);
-        bool set_engineTorque(int engineTorque_);
-        void reset_odometer(void);
-        bool set_odometer(unsigned int odometer_);
-        void reset_tripOdometer(void);
-        bool set_tripOdometer(unsigned int tripOdometer_);
-        void reset_satRadioESN(void);
-        bool set_satRadioESN(const std::string& satRadioESN_);
-
-    private:
-        friend class GetVehicleData_responseMarshaller;
-
-        /**
-             See GPSData
-             Subscribable
-        */
-        GPSData* gps;
-
-        /**
-             The vehicle speed in kilometers per hour
-             Subscribable
-        */
-        float* speed; //!<  (-100,500)
-
-        /**
-             The number of revolutions per minute of the engine
-             Subscribable
-        */
-        unsigned int* rpm;    //!<  (0,20000)
-
-        ///  The fuel level
-        float* fuelLevel; //!<  (0,100)
-
-        ///  The average fuel economy in litres/100km
-        float* avgFuelEconomy;    //!<  (0,7000)
-
-        ///  The voltage in Volts
-        float* batteryVoltage;    //!<  (0,26)
-
-        ///  The external temperature in degrees celsius.
-        float* externalTemperature;   //!<  (-40,100)
-
-        ///  Vehicle identification number.
-        std::string* vin; //!< (17)
-
-        /**
-             See PRNDL.
-             Subscribable
-        */
-        PRNDL* prndl;
-
-        /**
-             See TireStatus.
-             Subscribable
-        */
-        TireStatus* tirePressure;
-
-        ///  Battery pack voltage of hybrid and electrical vehicles in volts
-        float* batteryPackVoltage;    //!<  (-1000,1000)
-
-        ///  Battery current of hybrid and electrical vehicles in amperes
-        float* batteryPackCurrent;    //!<  (-1000,1000)
-
-        ///  Battery temperature of hybrid and electrical vehicles in degrees celsius
-        int* batteryPackTemperature;  //!<  (-50,250)
-
-        /**
-             Engine torque in Nm
-             Subscribable
-        */
-        int* engineTorque;    //!<  (-10000,55000)
-
-        ///  Odometer in km
-        unsigned int* odometer;   //!<  (0,2000000)
-
-        ///  Odometer of trip in km
-        unsigned int* tripOdometer;   //!<  (0,2000000)
-
-        ///  The hexadecimal ESN of the satellite radio (if supported).
-        std::string* satRadioESN; //!< (500)
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/GlobalProperty.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/GlobalProperty.h
deleted file mode 100644
index 2d61c2105..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/GlobalProperty.h
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_GLOBALPROPERTY_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_GLOBALPROPERTY_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  The different global properties.
-
-  class GlobalProperty
-  {
-  public:
-    enum GlobalPropertyInternal
-    {
-      INVALID_ENUM=-1,
-
-///  The property helpPrompt of setGlobalProperties
-      HELPPROMPT=0,
-
-///  The property timeoutPrompt of setGlobalProperties
-      TIMEOUTPROMPT=1,
-
-///  The property vrHelpTitle of setGlobalProperties
-      VRHELPTITLE=2,
-
-///  The property array of vrHelp of setGlobalProperties
-      VRHELPITEMS=3
-    };
-  
-    GlobalProperty() : mInternal(INVALID_ENUM)				{}
-    GlobalProperty(GlobalPropertyInternal e) : mInternal(e)		{}
-  
-    GlobalPropertyInternal get(void) const	{ return mInternal; }
-    void set(GlobalPropertyInternal e)		{ mInternal=e; }
-  
-  private:
-    GlobalPropertyInternal mInternal;
-    friend class GlobalPropertyMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/HMIApplication.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/HMIApplication.h
deleted file mode 100644
index 455d6eb19..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/HMIApplication.h
+++ /dev/null
@@ -1,124 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_HMIAPPLICATION_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_HMIAPPLICATION_INCLUDE
-
-#include <string>
-#include <vector>
-
-#include "AppType.h"
-#include "Language.h"
-#include "Language.h"
-#include "TTSChunk.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Data type containing information about application needed by HMI.
-
-  class HMIApplication
-  {
-  public:
-  
-    HMIApplication(const HMIApplication& c);
-    HMIApplication(void);
-  
-    bool checkIntegrity(void);
-  
-    ~HMIApplication(void);
-    HMIApplication& operator =(const HMIApplication&);
-
-// getters
-
-    int get_appId(void) const;
-    const std::string& get_appName(void) const;
-    const std::vector<AppType>* get_appType(void) const;
-    const std::string& get_deviceName(void) const;
-    const Language& get_hmiDisplayLanguageDesired(void) const;
-    const std::string* get_icon(void) const;
-    bool get_isMediaApplication(void) const;
-    const Language& get_languageDesired(void) const;
-    const std::string* get_ngnMediaScreenAppName(void) const;
-    const std::vector<TTSChunk>* get_ttsName(void) const;
-    const std::vector<std::string>* get_vrSynonyms(void) const;
-
-// setters
-
-    bool set_appId(int appId_);
-    bool set_appName(const std::string& appName_);
-    void reset_appType(void);
-    bool set_appType(const std::vector<AppType>& appType_);
-    bool set_deviceName(const std::string& deviceName_);
-    bool set_hmiDisplayLanguageDesired(const Language& hmiDisplayLanguageDesired_);
-    void reset_icon(void);
-    bool set_icon(const std::string& icon_);
-    bool set_isMediaApplication(bool isMediaApplication_);
-    bool set_languageDesired(const Language& languageDesired_);
-    void reset_ngnMediaScreenAppName(void);
-    bool set_ngnMediaScreenAppName(const std::string& ngnMediaScreenAppName_);
-    void reset_ttsName(void);
-    bool set_ttsName(const std::vector<TTSChunk>& ttsName_);
-    void reset_vrSynonyms(void);
-    bool set_vrSynonyms(const std::vector<std::string>& vrSynonyms_);
-
-  private:
-
-    friend class HMIApplicationMarshaller;
-
-      int appId;
-      std::string appName;	//!< (100)
-      std::vector<AppType>* appType;	//!<   [%s..%s] 
-      std::string deviceName;
-      Language hmiDisplayLanguageDesired;
-      std::string* icon;
-      bool isMediaApplication;
-      Language languageDesired;
-      std::string* ngnMediaScreenAppName;	//!< (100)
-      std::vector<TTSChunk>* ttsName;	//!<   [%s..%s] 
-      std::vector<std::string>* vrSynonyms;	//!<   [%s..%s] (40)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/HMILevel.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/HMILevel.h
deleted file mode 100644
index 1ce22f15e..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/HMILevel.h
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_HMILEVEL_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_HMILEVEL_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Enumeraction that describes current levels of HMI.
-
-  class HMILevel
-  {
-  public:
-    enum HMILevelInternal
-    {
-      INVALID_ENUM=-1,
-      HMI_FULL=0,
-      HMI_LIMITED=1,
-      HMI_BACKGROUND=2,
-      HMI_NONE=3
-    };
-  
-    HMILevel() : mInternal(INVALID_ENUM)				{}
-    HMILevel(HMILevelInternal e) : mInternal(e)		{}
-  
-    HMILevelInternal get(void) const	{ return mInternal; }
-    void set(HMILevelInternal e)		{ mInternal=e; }
-  
-  private:
-    HMILevelInternal mInternal;
-    friend class HMILevelMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/HMIPermissions.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/HMIPermissions.h
deleted file mode 100644
index 4726b4e9e..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/HMIPermissions.h
+++ /dev/null
@@ -1,87 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_HMIPERMISSIONS_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_HMIPERMISSIONS_INCLUDE
-
-#include <vector>
-
-#include "HMILevel.h"
-#include "HMILevel.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  class HMIPermissions
-  {
-  public:
-  
-    HMIPermissions(const HMIPermissions& c);
-    HMIPermissions(void);
-  
-    bool checkIntegrity(void);
-  // getters
-
-    const std::vector<HMILevel>& get_allowed(void) const;
-    const std::vector<HMILevel>& get_userDisallowed(void) const;
-
-// setters
-
-    bool set_allowed(const std::vector<HMILevel>& allowed_);
-    bool set_userDisallowed(const std::vector<HMILevel>& userDisallowed_);
-
-  private:
-
-    friend class HMIPermissionsMarshaller;
-
-
-///  A set of all HMI levels that are permitted for this given RPC.
-      std::vector<HMILevel> allowed;	//!<   [%s..%s] 
-
-///  A set of all HMI levels that are prohibited for this given RPC.
-      std::vector<HMILevel> userDisallowed;	//!<   [%s..%s] 
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/HmiZoneCapabilities.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/HmiZoneCapabilities.h
deleted file mode 100644
index d297ba5ff..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/HmiZoneCapabilities.h
+++ /dev/null
@@ -1,77 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_HMIZONECAPABILITIES_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_HMIZONECAPABILITIES_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-/**
-     Contains information about the HMI zone capabilities.
-     For future use.
-*/
-
-  class HmiZoneCapabilities
-  {
-  public:
-    enum HmiZoneCapabilitiesInternal
-    {
-      INVALID_ENUM=-1,
-      FRONT=0,
-      BACK=1
-    };
-  
-    HmiZoneCapabilities() : mInternal(INVALID_ENUM)				{}
-    HmiZoneCapabilities(HmiZoneCapabilitiesInternal e) : mInternal(e)		{}
-  
-    HmiZoneCapabilitiesInternal get(void) const	{ return mInternal; }
-    void set(HmiZoneCapabilitiesInternal e)		{ mInternal=e; }
-  
-  private:
-    HmiZoneCapabilitiesInternal mInternal;
-    friend class HmiZoneCapabilitiesMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Image.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Image.h
deleted file mode 100644
index 36b112480..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Image.h
+++ /dev/null
@@ -1,86 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_IMAGE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_IMAGE_INCLUDE
-
-#include <string>
-
-#include "ImageType.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  class Image
-  {
-  public:
-  
-    Image(const Image& c);
-    Image(void);
-  
-    bool checkIntegrity(void);
-  // getters
-
-    const ImageType& get_imageType(void) const;
-    const std::string& get_value(void) const;
-
-// setters
-
-    bool set_imageType(const ImageType& imageType_);
-    bool set_value(const std::string& value_);
-
-  private:
-
-    friend class ImageMarshaller;
-
-
-///  Describes, whether it is a static or dynamic image.
-      ImageType imageType;
-
-///  Either the static hex icon value or the binary image file name identifier (sent by PutFile).
-      std::string value;	//!< (65535)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ImageType.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ImageType.h
deleted file mode 100644
index b82242c61..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ImageType.h
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_IMAGETYPE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_IMAGETYPE_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Contains information about the type of image.
-
-  class ImageType
-  {
-  public:
-    enum ImageTypeInternal
-    {
-      INVALID_ENUM=-1,
-      STATIC=0,
-      DYNAMIC=1
-    };
-  
-    ImageType() : mInternal(INVALID_ENUM)				{}
-    ImageType(ImageTypeInternal e) : mInternal(e)		{}
-  
-    ImageTypeInternal get(void) const	{ return mInternal; }
-    void set(ImageTypeInternal e)		{ mInternal=e; }
-  
-  private:
-    ImageTypeInternal mInternal;
-    friend class ImageTypeMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/InteractionMode.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/InteractionMode.h
deleted file mode 100644
index 38f0d9b0e..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/InteractionMode.h
+++ /dev/null
@@ -1,83 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_INTERACTIONMODE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_INTERACTIONMODE_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-/**
-     For application-requested interactions, this mode indicates the method in which the user is notified and uses the interaction.
-     This mode causes the interaction to only occur on the display, meaning the choices are provided only via the display.
-     Selections are made with the OK and Seek Right and Left, Tune Up and Down buttons.
-     This mode causes the interaction to only occur using V4.
-     Selections are made by saying the command.
-     This mode causes both a VR and display selection option for an interaction.
-     Selections can be made either from the menu display or by speaking the command.
-*/
-
-  class InteractionMode
-  {
-  public:
-    enum InteractionModeInternal
-    {
-      INVALID_ENUM=-1,
-      MANUAL_ONLY=0,
-      VR_ONLY=1,
-      BOTH=2
-    };
-  
-    InteractionMode() : mInternal(INVALID_ENUM)				{}
-    InteractionMode(InteractionModeInternal e) : mInternal(e)		{}
-  
-    InteractionModeInternal get(void) const	{ return mInternal; }
-    void set(InteractionModeInternal e)		{ mInternal=e; }
-  
-  private:
-    InteractionModeInternal mInternal;
-    friend class InteractionModeMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Language.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Language.h
deleted file mode 100644
index 629cee579..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Language.h
+++ /dev/null
@@ -1,133 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_LANGUAGE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_LANGUAGE_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  class Language
-  {
-  public:
-    enum LanguageInternal
-    {
-      INVALID_ENUM=-1,
-
-///  US English
-      EN_US=0,
-
-///  Mexican Spanish
-      ES_MX=1,
-
-///  Canadian French
-      FR_CA=2,
-
-///  EU German
-      DE_EU=3,
-
-///  EU Spanish
-      ES_EU=4,
-
-///  UK English
-      EN_EU=5,
-
-///  Russian
-      RU_RU=6,
-
-///  Turkish
-      TR_TR=7,
-
-///  EU Polish
-      PL_EU=8,
-
-///  French
-      FR_EU=9,
-
-///  Italian
-      IT_EU=10,
-
-///  Swedish
-      SV_EU=11,
-
-///  Portuguese
-      PT_EU=12,
-
-///  Dutch (Standard)
-      NL_EU=13,
-
-///  Australian English
-      EN_AU=14,
-
-///  Chinese (Mandarin)
-      ZH_CN=15,
-
-///  Taiwanese (Mandarin)
-      ZH_TW=16,
-
-///  Japanese
-      JA_JP=17,
-
-///  Arabic
-      AR=18,
-
-///  Korean
-      KO_KR=19
-    };
-
-    Language() : mInternal(INVALID_ENUM)				{}
-    Language(LanguageInternal e) : mInternal(e)		{}
-    Language& operator=(const Language& lng) { set(lng.get()); return *this; }
-
-    bool operator== (const Language& lng) { return mInternal == lng.get(); }
-
-    LanguageInternal get(void) const	{ return mInternal; }
-    void set(LanguageInternal e)		{ mInternal=e; }
-
-  private:
-    LanguageInternal mInternal;
-    friend class LanguageMarshaller;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ListFiles_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ListFiles_request.h
deleted file mode 100644
index 821366603..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ListFiles_request.h
+++ /dev/null
@@ -1,78 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_LISTFILES_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_LISTFILES_REQUEST_INCLUDE
-
-
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-/**
-     Requests the current list of resident filenames for the registered app
-     Not supported on first generation SYNC vehicles. 
-*/
-
-  class ListFiles_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    ListFiles_request(const ListFiles_request& c);
-    ListFiles_request(void);
-    
-    virtual ~ListFiles_request(void);
-  
-    bool checkIntegrity(void);
-
-
-
-  private:
-  
-    friend class ListFiles_requestMarshaller;
-
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ListFiles_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ListFiles_response.h
deleted file mode 100644
index 92ee97a8a..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ListFiles_response.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_LISTFILES_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_LISTFILES_RESPONSE_INCLUDE
-
-#include <vector>
-#include <string>
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    /**
-         Returns the current list of resident filenames for the registered app along with the current space available
-         Not supported on First generation SYNC vehicles.
-    */
-    class ListFiles_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        ListFiles_response(const ListFiles_response& c);
-        ListFiles_response(void);
-
-        virtual ~ListFiles_response(void);
-
-        ListFiles_response& operator =(const ListFiles_response&);
-
-        bool checkIntegrity(void);
-
-        const std::vector<std::string>* get_filenames(void) const;
-        unsigned int get_spaceAvailable(void) const;
-
-        void reset_filenames(void);
-        bool set_filenames(const std::vector<std::string>& filenames_);
-        bool set_spaceAvailable(unsigned int spaceAvailable_);
-
-    private:
-        friend class ListFiles_responseMarshaller;
-
-        /**
-             An array of all filenames resident on SYNC for the given registered app.
-             If omitted, then no files currently reside on the system.
-        */
-        std::vector<std::string>* filenames;  //!<   [%s..%s] (500)
-
-        ///  Provides the total local space available on SYNC for the registered app.
-        unsigned int spaceAvailable;  //!<  (0,2000000000)
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Marshaller.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Marshaller.h
deleted file mode 100644
index 9a8d62819..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Marshaller.h
+++ /dev/null
@@ -1,1211 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_MARSHALLER_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_MARSHALLER_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "FunctionID.h"
-#include "messageType.h"
-
-#include "JSONHandler/SDLRPCMessage.h"
-#include "../src/SDLRPCObjectsImpl/V2/RegisterAppInterface_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/RegisterAppInterface_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/UnregisterAppInterface_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/UnregisterAppInterface_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/SetGlobalProperties_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/SetGlobalProperties_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResetGlobalProperties_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ResetGlobalProperties_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/AddCommand_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/AddCommand_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/DeleteCommand_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/DeleteCommand_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/AddSubMenu_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/AddSubMenu_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/DeleteSubMenu_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/DeleteSubMenu_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/CreateInteractionChoiceSet_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/CreateInteractionChoiceSet_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/PerformInteraction_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/PerformInteraction_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/DeleteInteractionChoiceSet_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/DeleteInteractionChoiceSet_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/Alert_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/Alert_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/Show_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/Show_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/Speak_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/Speak_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/SetMediaClockTimer_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/SetMediaClockTimer_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/EncodedSyncPData_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/EncodedSyncPData_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/DialNumber_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/DialNumber_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/PerformAudioPassThru_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/PerformAudioPassThru_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/EndAudioPassThru_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/EndAudioPassThru_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/SubscribeButton_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/SubscribeButton_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/UnsubscribeButton_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/UnsubscribeButton_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/SubscribeVehicleData_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/SubscribeVehicleData_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/UnsubscribeVehicleData_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/UnsubscribeVehicleData_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/GetVehicleData_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/GetVehicleData_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ReadDID_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ReadDID_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/GetDTCs_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/GetDTCs_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ScrollableMessage_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ScrollableMessage_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/Slider_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/Slider_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ShowConstantTBT_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ShowConstantTBT_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/AlertManeuver_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/AlertManeuver_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/UpdateTurnList_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/UpdateTurnList_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ChangeRegistration_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ChangeRegistration_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/GenericResponse_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/PutFile_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/PutFile_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/DeleteFile_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/DeleteFile_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ListFiles_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/ListFiles_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/SetAppIcon_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/SetAppIcon_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/SetDisplayLayout_requestMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/SetDisplayLayout_responseMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/OnHMIStatusMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/OnAppInterfaceUnregisteredMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/OnButtonEventMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/OnButtonPressMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/OnVehicleDataMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/OnCommandMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/OnEncodedSyncPDataMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/OnTBTClientStateMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/OnDriverDistractionMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/OnPermissionsChangeMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/OnAudioPassThruMarshaller.h"
-#include "../src/SDLRPCObjectsImpl/V2/OnLanguageChangeMarshaller.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-  class Marshaller
-  {
-  public:
-
-    Marshaller()					{}
-    ~Marshaller()					{}
-    
-    static NsSmartDeviceLinkRPC::SDLRPCMessage* fromString(const std::string&,FunctionID::FunctionIDInternal fid, messageType::messageTypeInternal mt);
-    static std::string toString(const NsSmartDeviceLinkRPC::SDLRPCMessage* msg,FunctionID::FunctionIDInternal fid, messageType::messageTypeInternal mt);
-
-    static NsSmartDeviceLinkRPC::SDLRPCMessage* fromJSON(const Json::Value&,FunctionID::FunctionIDInternal fid, messageType::messageTypeInternal mt);
-    static Json::Value toJSON(const NsSmartDeviceLinkRPC::SDLRPCMessage* msg,FunctionID::FunctionIDInternal fid, messageType::messageTypeInternal mt);
-  
-  protected:
-    
-
-// RegisterAppInterface_request
-    static bool fromString(const std::string& str, RegisterAppInterface_request& res)
-    {
-      return mRegisterAppInterface_request.fromString(str, res);
-    }
-
-    static std::string toString(const RegisterAppInterface_request& res)
-    {
-      return mRegisterAppInterface_request.toString(res);
-    }
-
-// RegisterAppInterface_response
-    static bool fromString(const std::string& str, RegisterAppInterface_response& res)
-    {
-      return mRegisterAppInterface_response.fromString(str, res);
-    }
-
-    static std::string toString(const RegisterAppInterface_response& res)
-    {
-      return mRegisterAppInterface_response.toString(res);
-    }
-
-// UnregisterAppInterface_request
-    static bool fromString(const std::string& str, UnregisterAppInterface_request& res)
-    {
-      return mUnregisterAppInterface_request.fromString(str, res);
-    }
-
-    static std::string toString(const UnregisterAppInterface_request& res)
-    {
-      return mUnregisterAppInterface_request.toString(res);
-    }
-
-// UnregisterAppInterface_response
-    static bool fromString(const std::string& str, UnregisterAppInterface_response& res)
-    {
-      return mUnregisterAppInterface_response.fromString(str, res);
-    }
-
-    static std::string toString(const UnregisterAppInterface_response& res)
-    {
-      return mUnregisterAppInterface_response.toString(res);
-    }
-
-// SetGlobalProperties_request
-    static bool fromString(const std::string& str, SetGlobalProperties_request& res)
-    {
-      return mSetGlobalProperties_request.fromString(str, res);
-    }
-
-    static std::string toString(const SetGlobalProperties_request& res)
-    {
-      return mSetGlobalProperties_request.toString(res);
-    }
-
-// SetGlobalProperties_response
-    static bool fromString(const std::string& str, SetGlobalProperties_response& res)
-    {
-      return mSetGlobalProperties_response.fromString(str, res);
-    }
-
-    static std::string toString(const SetGlobalProperties_response& res)
-    {
-      return mSetGlobalProperties_response.toString(res);
-    }
-
-// ResetGlobalProperties_request
-    static bool fromString(const std::string& str, ResetGlobalProperties_request& res)
-    {
-      return mResetGlobalProperties_request.fromString(str, res);
-    }
-
-    static std::string toString(const ResetGlobalProperties_request& res)
-    {
-      return mResetGlobalProperties_request.toString(res);
-    }
-
-// ResetGlobalProperties_response
-    static bool fromString(const std::string& str, ResetGlobalProperties_response& res)
-    {
-      return mResetGlobalProperties_response.fromString(str, res);
-    }
-
-    static std::string toString(const ResetGlobalProperties_response& res)
-    {
-      return mResetGlobalProperties_response.toString(res);
-    }
-
-// AddCommand_request
-    static bool fromString(const std::string& str, AddCommand_request& res)
-    {
-      return mAddCommand_request.fromString(str, res);
-    }
-
-    static std::string toString(const AddCommand_request& res)
-    {
-      return mAddCommand_request.toString(res);
-    }
-
-// AddCommand_response
-    static bool fromString(const std::string& str, AddCommand_response& res)
-    {
-      return mAddCommand_response.fromString(str, res);
-    }
-
-    static std::string toString(const AddCommand_response& res)
-    {
-      return mAddCommand_response.toString(res);
-    }
-
-// DeleteCommand_request
-    static bool fromString(const std::string& str, DeleteCommand_request& res)
-    {
-      return mDeleteCommand_request.fromString(str, res);
-    }
-
-    static std::string toString(const DeleteCommand_request& res)
-    {
-      return mDeleteCommand_request.toString(res);
-    }
-
-// DeleteCommand_response
-    static bool fromString(const std::string& str, DeleteCommand_response& res)
-    {
-      return mDeleteCommand_response.fromString(str, res);
-    }
-
-    static std::string toString(const DeleteCommand_response& res)
-    {
-      return mDeleteCommand_response.toString(res);
-    }
-
-// AddSubMenu_request
-    static bool fromString(const std::string& str, AddSubMenu_request& res)
-    {
-      return mAddSubMenu_request.fromString(str, res);
-    }
-
-    static std::string toString(const AddSubMenu_request& res)
-    {
-      return mAddSubMenu_request.toString(res);
-    }
-
-// AddSubMenu_response
-    static bool fromString(const std::string& str, AddSubMenu_response& res)
-    {
-      return mAddSubMenu_response.fromString(str, res);
-    }
-
-    static std::string toString(const AddSubMenu_response& res)
-    {
-      return mAddSubMenu_response.toString(res);
-    }
-
-// DeleteSubMenu_request
-    static bool fromString(const std::string& str, DeleteSubMenu_request& res)
-    {
-      return mDeleteSubMenu_request.fromString(str, res);
-    }
-
-    static std::string toString(const DeleteSubMenu_request& res)
-    {
-      return mDeleteSubMenu_request.toString(res);
-    }
-
-// DeleteSubMenu_response
-    static bool fromString(const std::string& str, DeleteSubMenu_response& res)
-    {
-      return mDeleteSubMenu_response.fromString(str, res);
-    }
-
-    static std::string toString(const DeleteSubMenu_response& res)
-    {
-      return mDeleteSubMenu_response.toString(res);
-    }
-
-// CreateInteractionChoiceSet_request
-    static bool fromString(const std::string& str, CreateInteractionChoiceSet_request& res)
-    {
-      return mCreateInteractionChoiceSet_request.fromString(str, res);
-    }
-
-    static std::string toString(const CreateInteractionChoiceSet_request& res)
-    {
-      return mCreateInteractionChoiceSet_request.toString(res);
-    }
-
-// CreateInteractionChoiceSet_response
-    static bool fromString(const std::string& str, CreateInteractionChoiceSet_response& res)
-    {
-      return mCreateInteractionChoiceSet_response.fromString(str, res);
-    }
-
-    static std::string toString(const CreateInteractionChoiceSet_response& res)
-    {
-      return mCreateInteractionChoiceSet_response.toString(res);
-    }
-
-// PerformInteraction_request
-    static bool fromString(const std::string& str, PerformInteraction_request& res)
-    {
-      return mPerformInteraction_request.fromString(str, res);
-    }
-
-    static std::string toString(const PerformInteraction_request& res)
-    {
-      return mPerformInteraction_request.toString(res);
-    }
-
-// PerformInteraction_response
-    static bool fromString(const std::string& str, PerformInteraction_response& res)
-    {
-      return mPerformInteraction_response.fromString(str, res);
-    }
-
-    static std::string toString(const PerformInteraction_response& res)
-    {
-      return mPerformInteraction_response.toString(res);
-    }
-
-// DeleteInteractionChoiceSet_request
-    static bool fromString(const std::string& str, DeleteInteractionChoiceSet_request& res)
-    {
-      return mDeleteInteractionChoiceSet_request.fromString(str, res);
-    }
-
-    static std::string toString(const DeleteInteractionChoiceSet_request& res)
-    {
-      return mDeleteInteractionChoiceSet_request.toString(res);
-    }
-
-// DeleteInteractionChoiceSet_response
-    static bool fromString(const std::string& str, DeleteInteractionChoiceSet_response& res)
-    {
-      return mDeleteInteractionChoiceSet_response.fromString(str, res);
-    }
-
-    static std::string toString(const DeleteInteractionChoiceSet_response& res)
-    {
-      return mDeleteInteractionChoiceSet_response.toString(res);
-    }
-
-// Alert_request
-    static bool fromString(const std::string& str, Alert_request& res)
-    {
-      return mAlert_request.fromString(str, res);
-    }
-
-    static std::string toString(const Alert_request& res)
-    {
-      return mAlert_request.toString(res);
-    }
-
-// Alert_response
-    static bool fromString(const std::string& str, Alert_response& res)
-    {
-      return mAlert_response.fromString(str, res);
-    }
-
-    static std::string toString(const Alert_response& res)
-    {
-      return mAlert_response.toString(res);
-    }
-
-// Show_request
-    static bool fromString(const std::string& str, Show_request& res)
-    {
-      return mShow_request.fromString(str, res);
-    }
-
-    static std::string toString(const Show_request& res)
-    {
-      return mShow_request.toString(res);
-    }
-
-// Show_response
-    static bool fromString(const std::string& str, Show_response& res)
-    {
-      return mShow_response.fromString(str, res);
-    }
-
-    static std::string toString(const Show_response& res)
-    {
-      return mShow_response.toString(res);
-    }
-
-// Speak_request
-    static bool fromString(const std::string& str, Speak_request& res)
-    {
-      return mSpeak_request.fromString(str, res);
-    }
-
-    static std::string toString(const Speak_request& res)
-    {
-      return mSpeak_request.toString(res);
-    }
-
-// Speak_response
-    static bool fromString(const std::string& str, Speak_response& res)
-    {
-      return mSpeak_response.fromString(str, res);
-    }
-
-    static std::string toString(const Speak_response& res)
-    {
-      return mSpeak_response.toString(res);
-    }
-
-// SetMediaClockTimer_request
-    static bool fromString(const std::string& str, SetMediaClockTimer_request& res)
-    {
-      return mSetMediaClockTimer_request.fromString(str, res);
-    }
-
-    static std::string toString(const SetMediaClockTimer_request& res)
-    {
-      return mSetMediaClockTimer_request.toString(res);
-    }
-
-// SetMediaClockTimer_response
-    static bool fromString(const std::string& str, SetMediaClockTimer_response& res)
-    {
-      return mSetMediaClockTimer_response.fromString(str, res);
-    }
-
-    static std::string toString(const SetMediaClockTimer_response& res)
-    {
-      return mSetMediaClockTimer_response.toString(res);
-    }
-
-// EncodedSyncPData_request
-    static bool fromString(const std::string& str, EncodedSyncPData_request& res)
-    {
-      return mEncodedSyncPData_request.fromString(str, res);
-    }
-
-    static std::string toString(const EncodedSyncPData_request& res)
-    {
-      return mEncodedSyncPData_request.toString(res);
-    }
-
-// EncodedSyncPData_response
-    static bool fromString(const std::string& str, EncodedSyncPData_response& res)
-    {
-      return mEncodedSyncPData_response.fromString(str, res);
-    }
-
-    static std::string toString(const EncodedSyncPData_response& res)
-    {
-      return mEncodedSyncPData_response.toString(res);
-    }
-
-// DialNumber_request
-    static bool fromString(const std::string& str, DialNumber_request& res)
-    {
-      return mDialNumber_request.fromString(str, res);
-    }
-
-    static std::string toString(const DialNumber_request& res)
-    {
-      return mDialNumber_request.toString(res);
-    }
-
-// DialNumber_response
-    static bool fromString(const std::string& str, DialNumber_response& res)
-    {
-      return mDialNumber_response.fromString(str, res);
-    }
-
-    static std::string toString(const DialNumber_response& res)
-    {
-      return mDialNumber_response.toString(res);
-    }
-
-// PerformAudioPassThru_request
-    static bool fromString(const std::string& str, PerformAudioPassThru_request& res)
-    {
-      return mPerformAudioPassThru_request.fromString(str, res);
-    }
-
-    static std::string toString(const PerformAudioPassThru_request& res)
-    {
-      return mPerformAudioPassThru_request.toString(res);
-    }
-
-// PerformAudioPassThru_response
-    static bool fromString(const std::string& str, PerformAudioPassThru_response& res)
-    {
-      return mPerformAudioPassThru_response.fromString(str, res);
-    }
-
-    static std::string toString(const PerformAudioPassThru_response& res)
-    {
-      return mPerformAudioPassThru_response.toString(res);
-    }
-
-// EndAudioPassThru_request
-    static bool fromString(const std::string& str, EndAudioPassThru_request& res)
-    {
-      return mEndAudioPassThru_request.fromString(str, res);
-    }
-
-    static std::string toString(const EndAudioPassThru_request& res)
-    {
-      return mEndAudioPassThru_request.toString(res);
-    }
-
-// EndAudioPassThru_response
-    static bool fromString(const std::string& str, EndAudioPassThru_response& res)
-    {
-      return mEndAudioPassThru_response.fromString(str, res);
-    }
-
-    static std::string toString(const EndAudioPassThru_response& res)
-    {
-      return mEndAudioPassThru_response.toString(res);
-    }
-
-// SubscribeButton_request
-    static bool fromString(const std::string& str, SubscribeButton_request& res)
-    {
-      return mSubscribeButton_request.fromString(str, res);
-    }
-
-    static std::string toString(const SubscribeButton_request& res)
-    {
-      return mSubscribeButton_request.toString(res);
-    }
-
-// SubscribeButton_response
-    static bool fromString(const std::string& str, SubscribeButton_response& res)
-    {
-      return mSubscribeButton_response.fromString(str, res);
-    }
-
-    static std::string toString(const SubscribeButton_response& res)
-    {
-      return mSubscribeButton_response.toString(res);
-    }
-
-// UnsubscribeButton_request
-    static bool fromString(const std::string& str, UnsubscribeButton_request& res)
-    {
-      return mUnsubscribeButton_request.fromString(str, res);
-    }
-
-    static std::string toString(const UnsubscribeButton_request& res)
-    {
-      return mUnsubscribeButton_request.toString(res);
-    }
-
-// UnsubscribeButton_response
-    static bool fromString(const std::string& str, UnsubscribeButton_response& res)
-    {
-      return mUnsubscribeButton_response.fromString(str, res);
-    }
-
-    static std::string toString(const UnsubscribeButton_response& res)
-    {
-      return mUnsubscribeButton_response.toString(res);
-    }
-
-// SubscribeVehicleData_request
-    static bool fromString(const std::string& str, SubscribeVehicleData_request& res)
-    {
-      return mSubscribeVehicleData_request.fromString(str, res);
-    }
-
-    static std::string toString(const SubscribeVehicleData_request& res)
-    {
-      return mSubscribeVehicleData_request.toString(res);
-    }
-
-// SubscribeVehicleData_response
-    static bool fromString(const std::string& str, SubscribeVehicleData_response& res)
-    {
-      return mSubscribeVehicleData_response.fromString(str, res);
-    }
-
-    static std::string toString(const SubscribeVehicleData_response& res)
-    {
-      return mSubscribeVehicleData_response.toString(res);
-    }
-
-// UnsubscribeVehicleData_request
-    static bool fromString(const std::string& str, UnsubscribeVehicleData_request& res)
-    {
-      return mUnsubscribeVehicleData_request.fromString(str, res);
-    }
-
-    static std::string toString(const UnsubscribeVehicleData_request& res)
-    {
-      return mUnsubscribeVehicleData_request.toString(res);
-    }
-
-// UnsubscribeVehicleData_response
-    static bool fromString(const std::string& str, UnsubscribeVehicleData_response& res)
-    {
-      return mUnsubscribeVehicleData_response.fromString(str, res);
-    }
-
-    static std::string toString(const UnsubscribeVehicleData_response& res)
-    {
-      return mUnsubscribeVehicleData_response.toString(res);
-    }
-
-// GetVehicleData_request
-    static bool fromString(const std::string& str, GetVehicleData_request& res)
-    {
-      return mGetVehicleData_request.fromString(str, res);
-    }
-
-    static std::string toString(const GetVehicleData_request& res)
-    {
-      return mGetVehicleData_request.toString(res);
-    }
-
-// GetVehicleData_response
-    static bool fromString(const std::string& str, GetVehicleData_response& res)
-    {
-      return mGetVehicleData_response.fromString(str, res);
-    }
-
-    static std::string toString(const GetVehicleData_response& res)
-    {
-      return mGetVehicleData_response.toString(res);
-    }
-
-// ReadDID_request
-    static bool fromString(const std::string& str, ReadDID_request& res)
-    {
-      return mReadDID_request.fromString(str, res);
-    }
-
-    static std::string toString(const ReadDID_request& res)
-    {
-      return mReadDID_request.toString(res);
-    }
-
-// ReadDID_response
-    static bool fromString(const std::string& str, ReadDID_response& res)
-    {
-      return mReadDID_response.fromString(str, res);
-    }
-
-    static std::string toString(const ReadDID_response& res)
-    {
-      return mReadDID_response.toString(res);
-    }
-
-// GetDTCs_request
-    static bool fromString(const std::string& str, GetDTCs_request& res)
-    {
-      return mGetDTCs_request.fromString(str, res);
-    }
-
-    static std::string toString(const GetDTCs_request& res)
-    {
-      return mGetDTCs_request.toString(res);
-    }
-
-// GetDTCs_response
-    static bool fromString(const std::string& str, GetDTCs_response& res)
-    {
-      return mGetDTCs_response.fromString(str, res);
-    }
-
-    static std::string toString(const GetDTCs_response& res)
-    {
-      return mGetDTCs_response.toString(res);
-    }
-
-// ScrollableMessage_request
-    static bool fromString(const std::string& str, ScrollableMessage_request& res)
-    {
-      return mScrollableMessage_request.fromString(str, res);
-    }
-
-    static std::string toString(const ScrollableMessage_request& res)
-    {
-      return mScrollableMessage_request.toString(res);
-    }
-
-// ScrollableMessage_response
-    static bool fromString(const std::string& str, ScrollableMessage_response& res)
-    {
-      return mScrollableMessage_response.fromString(str, res);
-    }
-
-    static std::string toString(const ScrollableMessage_response& res)
-    {
-      return mScrollableMessage_response.toString(res);
-    }
-
-// Slider_request
-    static bool fromString(const std::string& str, Slider_request& res)
-    {
-      return mSlider_request.fromString(str, res);
-    }
-
-    static std::string toString(const Slider_request& res)
-    {
-      return mSlider_request.toString(res);
-    }
-
-// Slider_response
-    static bool fromString(const std::string& str, Slider_response& res)
-    {
-      return mSlider_response.fromString(str, res);
-    }
-
-    static std::string toString(const Slider_response& res)
-    {
-      return mSlider_response.toString(res);
-    }
-
-// ShowConstantTBT_request
-    static bool fromString(const std::string& str, ShowConstantTBT_request& res)
-    {
-      return mShowConstantTBT_request.fromString(str, res);
-    }
-
-    static std::string toString(const ShowConstantTBT_request& res)
-    {
-      return mShowConstantTBT_request.toString(res);
-    }
-
-// ShowConstantTBT_response
-    static bool fromString(const std::string& str, ShowConstantTBT_response& res)
-    {
-      return mShowConstantTBT_response.fromString(str, res);
-    }
-
-    static std::string toString(const ShowConstantTBT_response& res)
-    {
-      return mShowConstantTBT_response.toString(res);
-    }
-
-// AlertManeuver_request
-    static bool fromString(const std::string& str, AlertManeuver_request& res)
-    {
-      return mAlertManeuver_request.fromString(str, res);
-    }
-
-    static std::string toString(const AlertManeuver_request& res)
-    {
-      return mAlertManeuver_request.toString(res);
-    }
-
-// AlertManeuver_response
-    static bool fromString(const std::string& str, AlertManeuver_response& res)
-    {
-      return mAlertManeuver_response.fromString(str, res);
-    }
-
-    static std::string toString(const AlertManeuver_response& res)
-    {
-      return mAlertManeuver_response.toString(res);
-    }
-
-// UpdateTurnList_request
-    static bool fromString(const std::string& str, UpdateTurnList_request& res)
-    {
-      return mUpdateTurnList_request.fromString(str, res);
-    }
-
-    static std::string toString(const UpdateTurnList_request& res)
-    {
-      return mUpdateTurnList_request.toString(res);
-    }
-
-// UpdateTurnList_response
-    static bool fromString(const std::string& str, UpdateTurnList_response& res)
-    {
-      return mUpdateTurnList_response.fromString(str, res);
-    }
-
-    static std::string toString(const UpdateTurnList_response& res)
-    {
-      return mUpdateTurnList_response.toString(res);
-    }
-
-// ChangeRegistration_request
-    static bool fromString(const std::string& str, ChangeRegistration_request& res)
-    {
-      return mChangeRegistration_request.fromString(str, res);
-    }
-
-    static std::string toString(const ChangeRegistration_request& res)
-    {
-      return mChangeRegistration_request.toString(res);
-    }
-
-// ChangeRegistration_response
-    static bool fromString(const std::string& str, ChangeRegistration_response& res)
-    {
-      return mChangeRegistration_response.fromString(str, res);
-    }
-
-    static std::string toString(const ChangeRegistration_response& res)
-    {
-      return mChangeRegistration_response.toString(res);
-    }
-
-// GenericResponse_response
-    static bool fromString(const std::string& str, GenericResponse_response& res)
-    {
-      return mGenericResponse_response.fromString(str, res);
-    }
-
-    static std::string toString(const GenericResponse_response& res)
-    {
-      return mGenericResponse_response.toString(res);
-    }
-
-// PutFile_request
-    static bool fromString(const std::string& str, PutFile_request& res)
-    {
-      return mPutFile_request.fromString(str, res);
-    }
-
-    static std::string toString(const PutFile_request& res)
-    {
-      return mPutFile_request.toString(res);
-    }
-
-// PutFile_response
-    static bool fromString(const std::string& str, PutFile_response& res)
-    {
-      return mPutFile_response.fromString(str, res);
-    }
-
-    static std::string toString(const PutFile_response& res)
-    {
-      return mPutFile_response.toString(res);
-    }
-
-// DeleteFile_request
-    static bool fromString(const std::string& str, DeleteFile_request& res)
-    {
-      return mDeleteFile_request.fromString(str, res);
-    }
-
-    static std::string toString(const DeleteFile_request& res)
-    {
-      return mDeleteFile_request.toString(res);
-    }
-
-// DeleteFile_response
-    static bool fromString(const std::string& str, DeleteFile_response& res)
-    {
-      return mDeleteFile_response.fromString(str, res);
-    }
-
-    static std::string toString(const DeleteFile_response& res)
-    {
-      return mDeleteFile_response.toString(res);
-    }
-
-// ListFiles_request
-    static bool fromString(const std::string& str, ListFiles_request& res)
-    {
-      return mListFiles_request.fromString(str, res);
-    }
-
-    static std::string toString(const ListFiles_request& res)
-    {
-      return mListFiles_request.toString(res);
-    }
-
-// ListFiles_response
-    static bool fromString(const std::string& str, ListFiles_response& res)
-    {
-      return mListFiles_response.fromString(str, res);
-    }
-
-    static std::string toString(const ListFiles_response& res)
-    {
-      return mListFiles_response.toString(res);
-    }
-
-// SetAppIcon_request
-    static bool fromString(const std::string& str, SetAppIcon_request& res)
-    {
-      return mSetAppIcon_request.fromString(str, res);
-    }
-
-    static std::string toString(const SetAppIcon_request& res)
-    {
-      return mSetAppIcon_request.toString(res);
-    }
-
-// SetAppIcon_response
-    static bool fromString(const std::string& str, SetAppIcon_response& res)
-    {
-      return mSetAppIcon_response.fromString(str, res);
-    }
-
-    static std::string toString(const SetAppIcon_response& res)
-    {
-      return mSetAppIcon_response.toString(res);
-    }
-
-// SetDisplayLayout_request
-    static bool fromString(const std::string& str, SetDisplayLayout_request& res)
-    {
-      return mSetDisplayLayout_request.fromString(str, res);
-    }
-
-    static std::string toString(const SetDisplayLayout_request& res)
-    {
-      return mSetDisplayLayout_request.toString(res);
-    }
-
-// SetDisplayLayout_response
-    static bool fromString(const std::string& str, SetDisplayLayout_response& res)
-    {
-      return mSetDisplayLayout_response.fromString(str, res);
-    }
-
-    static std::string toString(const SetDisplayLayout_response& res)
-    {
-      return mSetDisplayLayout_response.toString(res);
-    }
-
-// OnHMIStatus
-    static bool fromString(const std::string& str, OnHMIStatus& res)
-    {
-      return mOnHMIStatus.fromString(str, res);
-    }
-
-    static std::string toString(const OnHMIStatus& res)
-    {
-      return mOnHMIStatus.toString(res);
-    }
-
-// OnAppInterfaceUnregistered
-    static bool fromString(const std::string& str, OnAppInterfaceUnregistered& res)
-    {
-      return mOnAppInterfaceUnregistered.fromString(str, res);
-    }
-
-    static std::string toString(const OnAppInterfaceUnregistered& res)
-    {
-      return mOnAppInterfaceUnregistered.toString(res);
-    }
-
-// OnButtonEvent
-    static bool fromString(const std::string& str, OnButtonEvent& res)
-    {
-      return mOnButtonEvent.fromString(str, res);
-    }
-
-    static std::string toString(const OnButtonEvent& res)
-    {
-      return mOnButtonEvent.toString(res);
-    }
-
-// OnButtonPress
-    static bool fromString(const std::string& str, OnButtonPress& res)
-    {
-      return mOnButtonPress.fromString(str, res);
-    }
-
-    static std::string toString(const OnButtonPress& res)
-    {
-      return mOnButtonPress.toString(res);
-    }
-
-// OnVehicleData
-    static bool fromString(const std::string& str, OnVehicleData& res)
-    {
-      return mOnVehicleData.fromString(str, res);
-    }
-
-    static std::string toString(const OnVehicleData& res)
-    {
-      return mOnVehicleData.toString(res);
-    }
-
-// OnCommand
-    static bool fromString(const std::string& str, OnCommand& res)
-    {
-      return mOnCommand.fromString(str, res);
-    }
-
-    static std::string toString(const OnCommand& res)
-    {
-      return mOnCommand.toString(res);
-    }
-
-// OnEncodedSyncPData
-    static bool fromString(const std::string& str, OnEncodedSyncPData& res)
-    {
-      return mOnEncodedSyncPData.fromString(str, res);
-    }
-
-    static std::string toString(const OnEncodedSyncPData& res)
-    {
-      return mOnEncodedSyncPData.toString(res);
-    }
-
-// OnTBTClientState
-    static bool fromString(const std::string& str, OnTBTClientState& res)
-    {
-      return mOnTBTClientState.fromString(str, res);
-    }
-
-    static std::string toString(const OnTBTClientState& res)
-    {
-      return mOnTBTClientState.toString(res);
-    }
-
-// OnDriverDistraction
-    static bool fromString(const std::string& str, OnDriverDistraction& res)
-    {
-      return mOnDriverDistraction.fromString(str, res);
-    }
-
-    static std::string toString(const OnDriverDistraction& res)
-    {
-      return mOnDriverDistraction.toString(res);
-    }
-
-// OnPermissionsChange
-    static bool fromString(const std::string& str, OnPermissionsChange& res)
-    {
-      return mOnPermissionsChange.fromString(str, res);
-    }
-
-    static std::string toString(const OnPermissionsChange& res)
-    {
-      return mOnPermissionsChange.toString(res);
-    }
-
-// OnAudioPassThru
-    static bool fromString(const std::string& str, OnAudioPassThru& res)
-    {
-      return mOnAudioPassThru.fromString(str, res);
-    }
-
-    static std::string toString(const OnAudioPassThru& res)
-    {
-      return mOnAudioPassThru.toString(res);
-    }
-
-// OnLanguageChange
-    static bool fromString(const std::string& str, OnLanguageChange& res)
-    {
-      return mOnLanguageChange.fromString(str, res);
-    }
-
-    static std::string toString(const OnLanguageChange& res)
-    {
-      return mOnLanguageChange.toString(res);
-    }
-
-    static RegisterAppInterface_requestMarshaller mRegisterAppInterface_request;
-    static RegisterAppInterface_responseMarshaller mRegisterAppInterface_response;
-    static UnregisterAppInterface_requestMarshaller mUnregisterAppInterface_request;
-    static UnregisterAppInterface_responseMarshaller mUnregisterAppInterface_response;
-    static SetGlobalProperties_requestMarshaller mSetGlobalProperties_request;
-    static SetGlobalProperties_responseMarshaller mSetGlobalProperties_response;
-    static ResetGlobalProperties_requestMarshaller mResetGlobalProperties_request;
-    static ResetGlobalProperties_responseMarshaller mResetGlobalProperties_response;
-    static AddCommand_requestMarshaller mAddCommand_request;
-    static AddCommand_responseMarshaller mAddCommand_response;
-    static DeleteCommand_requestMarshaller mDeleteCommand_request;
-    static DeleteCommand_responseMarshaller mDeleteCommand_response;
-    static AddSubMenu_requestMarshaller mAddSubMenu_request;
-    static AddSubMenu_responseMarshaller mAddSubMenu_response;
-    static DeleteSubMenu_requestMarshaller mDeleteSubMenu_request;
-    static DeleteSubMenu_responseMarshaller mDeleteSubMenu_response;
-    static CreateInteractionChoiceSet_requestMarshaller mCreateInteractionChoiceSet_request;
-    static CreateInteractionChoiceSet_responseMarshaller mCreateInteractionChoiceSet_response;
-    static PerformInteraction_requestMarshaller mPerformInteraction_request;
-    static PerformInteraction_responseMarshaller mPerformInteraction_response;
-    static DeleteInteractionChoiceSet_requestMarshaller mDeleteInteractionChoiceSet_request;
-    static DeleteInteractionChoiceSet_responseMarshaller mDeleteInteractionChoiceSet_response;
-    static Alert_requestMarshaller mAlert_request;
-    static Alert_responseMarshaller mAlert_response;
-    static Show_requestMarshaller mShow_request;
-    static Show_responseMarshaller mShow_response;
-    static Speak_requestMarshaller mSpeak_request;
-    static Speak_responseMarshaller mSpeak_response;
-    static SetMediaClockTimer_requestMarshaller mSetMediaClockTimer_request;
-    static SetMediaClockTimer_responseMarshaller mSetMediaClockTimer_response;
-    static EncodedSyncPData_requestMarshaller mEncodedSyncPData_request;
-    static EncodedSyncPData_responseMarshaller mEncodedSyncPData_response;
-    static DialNumber_requestMarshaller mDialNumber_request;
-    static DialNumber_responseMarshaller mDialNumber_response;
-    static PerformAudioPassThru_requestMarshaller mPerformAudioPassThru_request;
-    static PerformAudioPassThru_responseMarshaller mPerformAudioPassThru_response;
-    static EndAudioPassThru_requestMarshaller mEndAudioPassThru_request;
-    static EndAudioPassThru_responseMarshaller mEndAudioPassThru_response;
-    static SubscribeButton_requestMarshaller mSubscribeButton_request;
-    static SubscribeButton_responseMarshaller mSubscribeButton_response;
-    static UnsubscribeButton_requestMarshaller mUnsubscribeButton_request;
-    static UnsubscribeButton_responseMarshaller mUnsubscribeButton_response;
-    static SubscribeVehicleData_requestMarshaller mSubscribeVehicleData_request;
-    static SubscribeVehicleData_responseMarshaller mSubscribeVehicleData_response;
-    static UnsubscribeVehicleData_requestMarshaller mUnsubscribeVehicleData_request;
-    static UnsubscribeVehicleData_responseMarshaller mUnsubscribeVehicleData_response;
-    static GetVehicleData_requestMarshaller mGetVehicleData_request;
-    static GetVehicleData_responseMarshaller mGetVehicleData_response;
-    static ReadDID_requestMarshaller mReadDID_request;
-    static ReadDID_responseMarshaller mReadDID_response;
-    static GetDTCs_requestMarshaller mGetDTCs_request;
-    static GetDTCs_responseMarshaller mGetDTCs_response;
-    static ScrollableMessage_requestMarshaller mScrollableMessage_request;
-    static ScrollableMessage_responseMarshaller mScrollableMessage_response;
-    static Slider_requestMarshaller mSlider_request;
-    static Slider_responseMarshaller mSlider_response;
-    static ShowConstantTBT_requestMarshaller mShowConstantTBT_request;
-    static ShowConstantTBT_responseMarshaller mShowConstantTBT_response;
-    static AlertManeuver_requestMarshaller mAlertManeuver_request;
-    static AlertManeuver_responseMarshaller mAlertManeuver_response;
-    static UpdateTurnList_requestMarshaller mUpdateTurnList_request;
-    static UpdateTurnList_responseMarshaller mUpdateTurnList_response;
-    static ChangeRegistration_requestMarshaller mChangeRegistration_request;
-    static ChangeRegistration_responseMarshaller mChangeRegistration_response;
-    static GenericResponse_responseMarshaller mGenericResponse_response;
-    static PutFile_requestMarshaller mPutFile_request;
-    static PutFile_responseMarshaller mPutFile_response;
-    static DeleteFile_requestMarshaller mDeleteFile_request;
-    static DeleteFile_responseMarshaller mDeleteFile_response;
-    static ListFiles_requestMarshaller mListFiles_request;
-    static ListFiles_responseMarshaller mListFiles_response;
-    static SetAppIcon_requestMarshaller mSetAppIcon_request;
-    static SetAppIcon_responseMarshaller mSetAppIcon_response;
-    static SetDisplayLayout_requestMarshaller mSetDisplayLayout_request;
-    static SetDisplayLayout_responseMarshaller mSetDisplayLayout_response;
-    static OnHMIStatusMarshaller mOnHMIStatus;
-    static OnAppInterfaceUnregisteredMarshaller mOnAppInterfaceUnregistered;
-    static OnButtonEventMarshaller mOnButtonEvent;
-    static OnButtonPressMarshaller mOnButtonPress;
-    static OnVehicleDataMarshaller mOnVehicleData;
-    static OnCommandMarshaller mOnCommand;
-    static OnEncodedSyncPDataMarshaller mOnEncodedSyncPData;
-    static OnTBTClientStateMarshaller mOnTBTClientState;
-    static OnDriverDistractionMarshaller mOnDriverDistraction;
-    static OnPermissionsChangeMarshaller mOnPermissionsChange;
-    static OnAudioPassThruMarshaller mOnAudioPassThru;
-    static OnLanguageChangeMarshaller mOnLanguageChange;
-
-private:
-
-    static Json::Value toJSONparam(const NsSmartDeviceLinkRPC::SDLRPCMessage* msg,FunctionID::FunctionIDInternal fid, messageType::messageTypeInternal mt);
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/MediaClockFormat.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/MediaClockFormat.h
deleted file mode 100644
index 895208e2e..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/MediaClockFormat.h
+++ /dev/null
@@ -1,113 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_MEDIACLOCKFORMAT_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_MEDIACLOCKFORMAT_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  class MediaClockFormat
-  {
-  public:
-    enum MediaClockFormatInternal
-    {
-      INVALID_ENUM=-1,
-
-/**
-     minutesFieldWidth = 2;minutesFieldMax = 19;secondsFieldWidth = 2;secondsFieldMax = 99;maxHours = 19;maxMinutes = 59;maxSeconds = 59;
-     used for Type II and CID headunits
-*/
-      CLOCK1=0,
-
-/**
-     minutesFieldWidth = 3;minutesFieldMax = 199;secondsFieldWidth = 2;secondsFieldMax = 99;maxHours = 59;maxMinutes = 59;maxSeconds = 59;
-     used for Type V headunit
-*/
-      CLOCK2=1,
-
-/**
-     5 characters possible
-     Format:      1|sp   c   :|sp   c   c
-     1|sp : digit "1" or space
-     c    : character out of following character set: sp|0-9|[letters, see TypeII column in XLS. See [@TODO: create file ref]]
-     :|sp : colon or space
-     used for Type II headunit
-*/
-      CLOCKTEXT1=2,
-
-/**
-     5 chars possible
-     Format:      1|sp   c   :|sp   c   c
-     1|sp : digit "1" or space
-     c    : character out of following character set: sp|0-9|[letters, see CID column in XLS. See [@TODO: create file ref]]
-     :|sp : colon or space
-     used for CID headunit
-     NOTE: difference between CLOCKTEXT1 and CLOCKTEXT2 is the supported character set
-*/
-      CLOCKTEXT2=3,
-
-/**
-     6 chars possible
-     Format:      1|sp   c   c   :|sp   c   c
-     1|sp : digit "1" or space
-     c    : character out of following character set: sp|0-9|[letters, see Type 5 column in XLS]. See [@TODO: create file ref]
-     :|sp : colon or space
-     used for Type V headunit
-*/
-      CLOCKTEXT3=4
-    };
-  
-    MediaClockFormat() : mInternal(INVALID_ENUM)				{}
-    MediaClockFormat(MediaClockFormatInternal e) : mInternal(e)		{}
-  
-    MediaClockFormatInternal get(void) const	{ return mInternal; }
-    void set(MediaClockFormatInternal e)		{ mInternal=e; }
-  
-  private:
-    MediaClockFormatInternal mInternal;
-    friend class MediaClockFormatMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/MenuParams.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/MenuParams.h
deleted file mode 100644
index ae9e24688..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/MenuParams.h
+++ /dev/null
@@ -1,105 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_MENUPARAMS_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_MENUPARAMS_INCLUDE
-
-#include <string>
-
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  class MenuParams
-  {
-  public:
-  
-    MenuParams(const MenuParams& c);
-    MenuParams(void);
-  
-    bool checkIntegrity(void);
-  
-    ~MenuParams(void);
-    MenuParams& operator =(const MenuParams&);
-
-// getters
-
-    const std::string& get_menuName(void) const;
-    const unsigned int* get_parentID(void) const;
-    const unsigned int* get_position(void) const;
-
-// setters
-
-    bool set_menuName(const std::string& menuName_);
-    void reset_parentID(void);
-    bool set_parentID(unsigned int parentID_);
-    void reset_position(void);
-    bool set_position(unsigned int position_);
-
-  private:
-
-    friend class MenuParamsMarshaller;
-
-
-///  Text to show in the menu for this sub menu.
-      std::string menuName;	//!< (500)
-
-/**
-     unique ID of the sub menu, the command will be added to.
-     If not provided, it will be provided to the top level of the in application menu.
-*/
-      unsigned int* parentID;	//!<  (0,2000000000)
-
-/**
-     Position within the items that are are at top level of the in application menu.
-     0 will insert at the front.
-     1 will insert at the second position.
-     if position is greater or equal than the number of items on top level, the sub menu will be appended to the end.
-     If this param was omitted the entry will be added at the end.
-*/
-      unsigned int* position;	//!<  (0,1000)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnAppInterfaceUnregistered.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnAppInterfaceUnregistered.h
deleted file mode 100644
index 51b2f1650..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnAppInterfaceUnregistered.h
+++ /dev/null
@@ -1,79 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_ONAPPINTERFACEUNREGISTERED_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_ONAPPINTERFACEUNREGISTERED_INCLUDE
-
-
-#include "AppInterfaceUnregisteredReason.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  class OnAppInterfaceUnregistered : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    OnAppInterfaceUnregistered(const OnAppInterfaceUnregistered& c);
-    OnAppInterfaceUnregistered(void);
-    
-    virtual ~OnAppInterfaceUnregistered(void);
-  
-    bool checkIntegrity(void);
-
-    const AppInterfaceUnregisteredReason& get_reason(void) const;
-
-    bool set_reason(const AppInterfaceUnregisteredReason& reason_);
-
-  private:
-  
-    friend class OnAppInterfaceUnregisteredMarshaller;
-
-
-///  See AppInterfaceUnregisteredReason
-      AppInterfaceUnregisteredReason reason;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnAudioPassThru.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnAudioPassThru.h
deleted file mode 100644
index 536ea98b0..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnAudioPassThru.h
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_ONAUDIOPASSTHRU_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_ONAUDIOPASSTHRU_INCLUDE
-
-
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  class OnAudioPassThru : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    OnAudioPassThru(const OnAudioPassThru& c);
-    OnAudioPassThru(void);
-    
-    virtual ~OnAudioPassThru(void);
-  
-    bool checkIntegrity(void);
-
-
-
-  private:
-  
-    friend class OnAudioPassThruMarshaller;
-
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnButtonEvent.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnButtonEvent.h
deleted file mode 100644
index 74405a312..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnButtonEvent.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_ONBUTTONEVENT_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_ONBUTTONEVENT_INCLUDE
-
-
-#include "ButtonEventMode.h"
-#include "ButtonName.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Notifies application of UP/DOWN events for buttons to which the application is subscribed.
-
-  class OnButtonEvent : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    OnButtonEvent(const OnButtonEvent& c);
-    OnButtonEvent(void);
-    
-    virtual ~OnButtonEvent(void);
-  
-    bool checkIntegrity(void);
-
-    const ButtonName& get_buttonName(void) const;
-    const ButtonEventMode& get_buttonEventMode(void) const;
-    unsigned int get_customButtonID(void) const;
-
-    bool set_buttonName(const ButtonName& buttonName_);
-    bool set_buttonEventMode(const ButtonEventMode& buttonEventMode_);
-    bool set_customButtonID(unsigned int customButtonID_);
-
-  private:
-  
-    friend class OnButtonEventMarshaller;
-
-      ButtonName buttonName;
-
-///  Indicates whether this is an UP or DOWN event.
-      ButtonEventMode buttonEventMode;
-
-///  If ButtonName is “CUSTOM_BUTTON", this references the integer ID passed by a custom button. (e.g. softButton ID)
-      unsigned int customButtonID;	//!<  (0,65536)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnButtonPress.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnButtonPress.h
deleted file mode 100644
index ff79e2bdd..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnButtonPress.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_ONBUTTONPRESS_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_ONBUTTONPRESS_INCLUDE
-
-
-#include "ButtonName.h"
-#include "ButtonPressMode.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Notifies application of LONG/SHORT press events for buttons to which the application is subscribed.
-
-  class OnButtonPress : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    OnButtonPress(const OnButtonPress& c);
-    OnButtonPress(void);
-    
-    virtual ~OnButtonPress(void);
-  
-    bool checkIntegrity(void);
-
-    const ButtonName& get_buttonName(void) const;
-    const ButtonPressMode& get_buttonPressMode(void) const;
-    unsigned int get_customButtonID(void) const;
-
-    bool set_buttonName(const ButtonName& buttonName_);
-    bool set_buttonPressMode(const ButtonPressMode& buttonPressMode_);
-    bool set_customButtonID(unsigned int customButtonID_);
-
-  private:
-  
-    friend class OnButtonPressMarshaller;
-
-      ButtonName buttonName;
-
-///  Indicates whether this is a LONG or SHORT button press event.
-      ButtonPressMode buttonPressMode;
-
-///  If ButtonName is “CUSTOM_BUTTON", this references the integer ID passed by a custom button. (e.g. softButton ID)
-      unsigned int customButtonID;	//!<  (0,65536)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnCommand.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnCommand.h
deleted file mode 100644
index 884933325..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnCommand.h
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_ONCOMMAND_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_ONCOMMAND_INCLUDE
-
-
-#include "TriggerSource.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  class OnCommand : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    OnCommand(const OnCommand& c);
-    OnCommand(void);
-    
-    virtual ~OnCommand(void);
-  
-    bool checkIntegrity(void);
-
-    unsigned int get_cmdID(void) const;
-    const TriggerSource& get_triggerSource(void) const;
-
-    bool set_cmdID(unsigned int cmdID_);
-    bool set_triggerSource(const TriggerSource& triggerSource_);
-
-  private:
-  
-    friend class OnCommandMarshaller;
-
-
-///  Command ID, which is related to a specific menu entry.
-      unsigned int cmdID;	//!<  (0,2000000000)
-
-///  See TriggerSource
-      TriggerSource triggerSource;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnDriverDistraction.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnDriverDistraction.h
deleted file mode 100644
index ecb09bd3f..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnDriverDistraction.h
+++ /dev/null
@@ -1,81 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_ONDRIVERDISTRACTION_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_ONDRIVERDISTRACTION_INCLUDE
-
-
-#include "DriverDistractionState.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Provides driver distraction state to mobile applications
-
-  class OnDriverDistraction : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    OnDriverDistraction(const OnDriverDistraction& c);
-    OnDriverDistraction(void);
-    
-    virtual ~OnDriverDistraction(void);
-  
-    bool checkIntegrity(void);
-
-    const DriverDistractionState& get_state(void) const;
-
-    bool set_state(const DriverDistractionState& state_);
-
-  private:
-  
-    friend class OnDriverDistractionMarshaller;
-
-
-///  Current State of Driver Distraction
-      DriverDistractionState state;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnEncodedSyncPData.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnEncodedSyncPData.h
deleted file mode 100644
index 0669b2eb5..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnEncodedSyncPData.h
+++ /dev/null
@@ -1,102 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_ONENCODEDSYNCPDATA_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_ONENCODEDSYNCPDATA_INCLUDE
-
-#include <vector>
-#include <string>
-
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Callback including encoded data of any SyncP packets that SYNC needs to send back to the mobile device.
-
-  class OnEncodedSyncPData : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    OnEncodedSyncPData(const OnEncodedSyncPData& c);
-    OnEncodedSyncPData(void);
-    
-    virtual ~OnEncodedSyncPData(void);
-  
-    OnEncodedSyncPData& operator =(const OnEncodedSyncPData&);
-  
-    bool checkIntegrity(void);
-
-    const std::vector<std::string>& get_data(void) const;
-    const std::string* get_URL(void) const;
-    const int* get_Timeout(void) const;
-
-    bool set_data(const std::vector<std::string>& data_);
-    void reset_URL(void);
-    bool set_URL(const std::string& URL_);
-    void reset_Timeout(void);
-    bool set_Timeout(int Timeout_);
-
-  private:
-  
-    friend class OnEncodedSyncPDataMarshaller;
-
-
-///  Contains base64 encoded string of SyncP packets.
-      std::vector<std::string> data;	//!<   [%s..%s] (10000)
-
-/**
-     If blank, the SyncP data shall be forwarded to the app.
-     If not blank, the SyncP data shall be forwarded to the provided URL.
-*/
-      std::string* URL;	//!< (1000)
-
-/**
-     If blank, the SyncP data shall be forwarded to the app.
-     If not blank, the SyncP data shall be forwarded with the provided timeout in seconds.
-*/
-      int* Timeout;	//!<  (-2000000000,2000000000)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnHMIStatus.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnHMIStatus.h
deleted file mode 100644
index 7ae9c4369..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnHMIStatus.h
+++ /dev/null
@@ -1,91 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_ONHMISTATUS_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_ONHMISTATUS_INCLUDE
-
-
-#include "AudioStreamingState.h"
-#include "HMILevel.h"
-#include "SystemContext.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  class OnHMIStatus : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    OnHMIStatus(const OnHMIStatus& c);
-    OnHMIStatus(void);
-    
-    virtual ~OnHMIStatus(void);
-  
-    bool checkIntegrity(void);
-
-    const HMILevel& get_hmiLevel(void) const;
-    const AudioStreamingState& get_audioStreamingState(void) const;
-    const SystemContext& get_systemContext(void) const;
-
-    bool set_hmiLevel(const HMILevel& hmiLevel_);
-    bool set_audioStreamingState(const AudioStreamingState& audioStreamingState_);
-    bool set_systemContext(const SystemContext& systemContext_);
-
-  private:
-  
-    friend class OnHMIStatusMarshaller;
-
-
-///  See HMILevel
-      HMILevel hmiLevel;
-
-///  See AudioStreamingState
-      AudioStreamingState audioStreamingState;
-
-///  See SystemContext
-      SystemContext systemContext;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnLanguageChange.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnLanguageChange.h
deleted file mode 100644
index 3b51b5df7..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnLanguageChange.h
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_ONLANGUAGECHANGE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_ONLANGUAGECHANGE_INCLUDE
-
-
-#include "Language.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  class OnLanguageChange : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    OnLanguageChange(const OnLanguageChange& c);
-    OnLanguageChange(void);
-    
-    virtual ~OnLanguageChange(void);
-  
-    bool checkIntegrity(void);
-
-    const Language& get_language(void) const;
-    const Language& get_hmiDisplayLanguage(void) const;
-
-    bool set_language(const Language& language_);
-    bool set_hmiDisplayLanguage(const Language& hmiDisplayLanguage_);
-
-  private:
-  
-    friend class OnLanguageChangeMarshaller;
-
-
-///  Current SYNC voice engine (VR+TTS) language
-      Language language;
-
-///  Current display language
-      Language hmiDisplayLanguage;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnPermissionsChange.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnPermissionsChange.h
deleted file mode 100644
index 57d0f0d10..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnPermissionsChange.h
+++ /dev/null
@@ -1,82 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_ONPERMISSIONSCHANGE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_ONPERMISSIONSCHANGE_INCLUDE
-
-#include <vector>
-
-#include "PermissionItem.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Provides update to app of which policy-table-enabled functions are available
-
-  class OnPermissionsChange : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    OnPermissionsChange(const OnPermissionsChange& c);
-    OnPermissionsChange(void);
-    
-    virtual ~OnPermissionsChange(void);
-  
-    bool checkIntegrity(void);
-
-    const std::vector<PermissionItem>& get_permissionItem(void) const;
-
-    bool set_permissionItem(const std::vector<PermissionItem>& permissionItem_);
-
-  private:
-  
-    friend class OnPermissionsChangeMarshaller;
-
-
-///  Change in permissions for a given set of RPCs.
-      std::vector<PermissionItem> permissionItem;	//!<   [%s..%s] 
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnTBTClientState.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnTBTClientState.h
deleted file mode 100644
index 7e7b87788..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnTBTClientState.h
+++ /dev/null
@@ -1,81 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_ONTBTCLIENTSTATE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_ONTBTCLIENTSTATE_INCLUDE
-
-
-#include "TBTState.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Provides applications with notifications specific to the current TBT client status on the module
-
-  class OnTBTClientState : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    OnTBTClientState(const OnTBTClientState& c);
-    OnTBTClientState(void);
-    
-    virtual ~OnTBTClientState(void);
-  
-    bool checkIntegrity(void);
-
-    const TBTState& get_state(void) const;
-
-    bool set_state(const TBTState& state_);
-
-  private:
-  
-    friend class OnTBTClientStateMarshaller;
-
-
-///  Current State of TBT client
-      TBTState state;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnVehicleData.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnVehicleData.h
deleted file mode 100644
index 3be2abed0..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/OnVehicleData.h
+++ /dev/null
@@ -1,201 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_ONVEHICLEDATA_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_ONVEHICLEDATA_INCLUDE
-
-#include <string>
-
-#include "GPSData.h"
-#include "PRNDL.h"
-#include "TireStatus.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Callback for the periodic and non periodic vehicle data read function.
-
-  class OnVehicleData : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    OnVehicleData(const OnVehicleData& c);
-    OnVehicleData(void);
-    
-    virtual ~OnVehicleData(void);
-  
-    OnVehicleData& operator =(const OnVehicleData&);
-  
-    bool checkIntegrity(void);
-
-    const GPSData* get_gps(void) const;
-    const float* get_speed(void) const;
-    const unsigned int* get_rpm(void) const;
-    const float* get_fuelLevel(void) const;
-    const float* get_avgFuelEconomy(void) const;
-    const float* get_batteryVoltage(void) const;
-    const float* get_externalTemperature(void) const;
-    const std::string* get_vin(void) const;
-    const PRNDL* get_prndl(void) const;
-    const TireStatus* get_tirePressure(void) const;
-    const float* get_batteryPackVoltage(void) const;
-    const float* get_batteryPackCurrent(void) const;
-    const int* get_batteryPackTemperature(void) const;
-    const int* get_engineTorque(void) const;
-    const unsigned int* get_odometer(void) const;
-    const unsigned int* get_tripOdometer(void) const;
-    const std::string* get_genericbinary(void) const;
-
-    void reset_gps(void);
-    bool set_gps(const GPSData& gps_);
-    void reset_speed(void);
-    bool set_speed(float speed_);
-    void reset_rpm(void);
-    bool set_rpm(unsigned int rpm_);
-    void reset_fuelLevel(void);
-    bool set_fuelLevel(float fuelLevel_);
-    void reset_avgFuelEconomy(void);
-    bool set_avgFuelEconomy(float avgFuelEconomy_);
-    void reset_batteryVoltage(void);
-    bool set_batteryVoltage(float batteryVoltage_);
-    void reset_externalTemperature(void);
-    bool set_externalTemperature(float externalTemperature_);
-    void reset_vin(void);
-    bool set_vin(const std::string& vin_);
-    void reset_prndl(void);
-    bool set_prndl(const PRNDL& prndl_);
-    void reset_tirePressure(void);
-    bool set_tirePressure(const TireStatus& tirePressure_);
-    void reset_batteryPackVoltage(void);
-    bool set_batteryPackVoltage(float batteryPackVoltage_);
-    void reset_batteryPackCurrent(void);
-    bool set_batteryPackCurrent(float batteryPackCurrent_);
-    void reset_batteryPackTemperature(void);
-    bool set_batteryPackTemperature(int batteryPackTemperature_);
-    void reset_engineTorque(void);
-    bool set_engineTorque(int engineTorque_);
-    void reset_odometer(void);
-    bool set_odometer(unsigned int odometer_);
-    void reset_tripOdometer(void);
-    bool set_tripOdometer(unsigned int tripOdometer_);
-    void reset_genericbinary(void);
-    bool set_genericbinary(const std::string& genericbinary_);
-
-  private:
-  
-    friend class OnVehicleDataMarshaller;
-
-
-/**
-     See GPSData
-     Subscribable
-*/
-      GPSData* gps;
-
-/**
-     The vehicle speed in kilometers per hour
-     Subscribable
-*/
-      float* speed;	//!<  (-100,500)
-
-/**
-     The number of revolutions per minute of the engine
-     Subscribable
-*/
-      unsigned int* rpm;	//!<  (0,20000)
-
-///  The fuel level
-      float* fuelLevel;	//!<  (0,100)
-
-///  The average fuel economy in litres/100km
-      float* avgFuelEconomy;	//!<  (0,7000)
-
-///  The voltage in Volts
-      float* batteryVoltage;	//!<  (0,26)
-
-///  The external temperature in degrees celsius.
-      float* externalTemperature;	//!<  (-40,100)
-
-///  Vehicle identification number.
-      std::string* vin;	//!< (17)
-
-/**
-     See PRNDL.
-     Subscribable
-*/
-      PRNDL* prndl;
-
-/**
-     See TireStatus.
-     Subscribable
-*/
-      TireStatus* tirePressure;
-
-///  Battery pack voltage of hybrid and electrical vehicles in volts
-      float* batteryPackVoltage;	//!<  (-1000,1000)
-
-///  Battery current of hybrid and electrical vehicles in amperes
-      float* batteryPackCurrent;	//!<  (-1000,1000)
-
-///  Battery temperature of hybrid and electrical vehicles in degrees celsius
-      int* batteryPackTemperature;	//!<  (-50,250)
-
-/**
-     Engine torque in Nm
-     Subscribable
-*/
-      int* engineTorque;	//!<  (-10000,55000)
-
-///  Odometer in km
-      unsigned int* odometer;	//!<  (0,2000000)
-
-///  Odometer of trip in km
-      unsigned int* tripOdometer;	//!<  (0,2000000)
-
-///  The hex value string is a string of hexadecimal chars, for example "FE12" or "1234ABCD".
-      std::string* genericbinary;	//!< (500)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/PRNDL.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/PRNDL.h
deleted file mode 100644
index dfad49589..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/PRNDL.h
+++ /dev/null
@@ -1,100 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_PRNDL_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_PRNDL_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  The selected gear.
-
-  class PRNDL
-  {
-  public:
-    enum PRNDLInternal
-    {
-      INVALID_ENUM=-1,
-
-///  Parking
-      PARK=0,
-
-///  Reverse gear
-      REVERSE=1,
-
-///  No gear
-      NEUTRAL=2,
-
-///  1st gear hold
-      LOWGEAR=3,
-      FORWARD_DRIVE_2=4,
-      FORWARD_DRIVE_3=5,
-
-///  Or Overdrive
-      FORWARD_DRIVE_4=6,
-
-///  Or Overdrive
-      FORWARD_DRIVE_5=7,
-
-///  Or Overdrive
-      FORWARD_DRIVE_6=8,
-      SECOND_GEAR_HOLD=9,
-      THIRD_GEAR_HOLD=10,
-      FOURTH_GEAR_HOLD=11,
-      FIFTH_GEAR_HOLD=12,
-      SIXTH_GEAR_HOLD=13
-    };
-  
-    PRNDL() : mInternal(INVALID_ENUM)				{}
-    PRNDL(PRNDLInternal e) : mInternal(e)		{}
-  
-    PRNDLInternal get(void) const	{ return mInternal; }
-    void set(PRNDLInternal e)		{ mInternal=e; }
-  
-  private:
-    PRNDLInternal mInternal;
-    friend class PRNDLMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ParameterPermissions.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ParameterPermissions.h
deleted file mode 100644
index 1c9ca9927..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ParameterPermissions.h
+++ /dev/null
@@ -1,86 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_PARAMETERPERMISSIONS_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_PARAMETERPERMISSIONS_INCLUDE
-
-#include <string>
-#include <vector>
-
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  class ParameterPermissions
-  {
-  public:
-  
-    ParameterPermissions(const ParameterPermissions& c);
-    ParameterPermissions(void);
-  
-    bool checkIntegrity(void);
-  // getters
-
-    const std::vector<std::string>& get_allowed(void) const;
-    const std::vector<std::string>& get_userDisallowed(void) const;
-
-// setters
-
-    bool set_allowed(const std::vector<std::string>& allowed_);
-    bool set_userDisallowed(const std::vector<std::string>& userDisallowed_);
-
-  private:
-
-    friend class ParameterPermissionsMarshaller;
-
-
-///  A set of all parameters that are permitted for this given RPC.
-      std::vector<std::string> allowed;	//!<   [%s..%s] (100)
-
-///  A set of all parameters that are prohibited for this given RPC.
-      std::vector<std::string> userDisallowed;	//!<   [%s..%s] 
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/PerformAudioPassThru_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/PerformAudioPassThru_request.h
deleted file mode 100644
index 1505da6a5..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/PerformAudioPassThru_request.h
+++ /dev/null
@@ -1,124 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_PERFORMAUDIOPASSTHRU_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_PERFORMAUDIOPASSTHRU_REQUEST_INCLUDE
-
-#include <vector>
-#include <string>
-
-#include "AudioCaptureQuality.h"
-#include "AudioType.h"
-#include "SamplingRate.h"
-#include "TTSChunk.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Starts audio pass thru session 
-
-  class PerformAudioPassThru_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    PerformAudioPassThru_request(const PerformAudioPassThru_request& c);
-    PerformAudioPassThru_request(void);
-    
-    virtual ~PerformAudioPassThru_request(void);
-  
-    PerformAudioPassThru_request& operator =(const PerformAudioPassThru_request&);
-  
-    bool checkIntegrity(void);
-
-    const std::vector<TTSChunk>& get_initialPrompt(void) const;
-    const std::string* get_audioPassThruDisplayText1(void) const;
-    const std::string* get_audioPassThruDisplayText2(void) const;
-    const SamplingRate& get_samplingRate(void) const;
-    unsigned int get_maxDuration(void) const;
-    const AudioCaptureQuality& get_bitsPerSample(void) const;
-    const AudioType& get_audioType(void) const;
-
-    bool set_initialPrompt(const std::vector<TTSChunk>& initialPrompt_);
-    void reset_audioPassThruDisplayText1(void);
-    bool set_audioPassThruDisplayText1(const std::string& audioPassThruDisplayText1_);
-    void reset_audioPassThruDisplayText2(void);
-    bool set_audioPassThruDisplayText2(const std::string& audioPassThruDisplayText2_);
-    bool set_samplingRate(const SamplingRate& samplingRate_);
-    bool set_maxDuration(unsigned int maxDuration_);
-    bool set_bitsPerSample(const AudioCaptureQuality& bitsPerSample_);
-    bool set_audioType(const AudioType& audioType_);
-
-  private:
-  
-    friend class PerformAudioPassThru_requestMarshaller;
-
-
-/**
-     SYNC will speak this prompt before opening the audio pass thru session
-     An array of text chunks of type TTSChunk. See TTSChunk
-     The array must have at least one item
-*/
-      std::vector<TTSChunk> initialPrompt;	//!<   [%s..%s] 
-
-///  First line of text displayed during audio capture.
-      std::string* audioPassThruDisplayText1;	//!< (500)
-
-///  Second line of text displayed during audio capture.
-      std::string* audioPassThruDisplayText2;	//!< (500)
-
-///   This value shall be allowed at 8 khz or 16 or 22 or 44 khz.
-      SamplingRate samplingRate;
-
-///  The maximum duration of audio recording in milliseconds. 
-      unsigned int maxDuration;	//!<  (0,1000000)
-
-///  Specifies the quality the audio is recorded. Currently 8 bit or 16 bit.
-      AudioCaptureQuality bitsPerSample;
-
-///  Specifies the type of audio data being requested.
-      AudioType audioType;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/PerformAudioPassThru_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/PerformAudioPassThru_response.h
deleted file mode 100644
index 802e54ff4..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/PerformAudioPassThru_response.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_PERFORMAUDIOPASSTHRU_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_PERFORMAUDIOPASSTHRU_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    class PerformAudioPassThru_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        PerformAudioPassThru_response(const PerformAudioPassThru_response& c);
-        PerformAudioPassThru_response(void);
-
-        virtual ~PerformAudioPassThru_response(void);
-
-        PerformAudioPassThru_response& operator =(const PerformAudioPassThru_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class PerformAudioPassThru_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/PerformInteraction_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/PerformInteraction_request.h
deleted file mode 100644
index a44bf50f4..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/PerformInteraction_request.h
+++ /dev/null
@@ -1,144 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_PERFORMINTERACTION_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_PERFORMINTERACTION_REQUEST_INCLUDE
-
-#include <vector>
-#include <string>
-
-#include "InteractionMode.h"
-#include "TTSChunk.h"
-#include "VrHelpItem.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Triggers an interaction (e.g. "Permit GPS?" - Yes, no, Always Allow).
-
-  class PerformInteraction_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    PerformInteraction_request(const PerformInteraction_request& c);
-    PerformInteraction_request(void);
-    
-    virtual ~PerformInteraction_request(void);
-  
-    PerformInteraction_request& operator =(const PerformInteraction_request&);
-  
-    bool checkIntegrity(void);
-
-    const std::string& get_initialText(void) const;
-    const std::vector<TTSChunk>& get_initialPrompt(void) const;
-    const InteractionMode& get_interactionMode(void) const;
-    const std::vector<unsigned int>& get_interactionChoiceSetIDList(void) const;
-    const std::vector<TTSChunk>* get_helpPrompt(void) const;
-    const std::vector<TTSChunk>* get_timeoutPrompt(void) const;
-    const unsigned int* get_timeout(void) const;
-    const std::vector<VrHelpItem>* get_vrHelp(void) const;
-
-    bool set_initialText(const std::string& initialText_);
-    bool set_initialPrompt(const std::vector<TTSChunk>& initialPrompt_);
-    bool set_interactionMode(const InteractionMode& interactionMode_);
-    bool set_interactionChoiceSetIDList(const std::vector<unsigned int>& interactionChoiceSetIDList_);
-    void reset_helpPrompt(void);
-    bool set_helpPrompt(const std::vector<TTSChunk>& helpPrompt_);
-    void reset_timeoutPrompt(void);
-    bool set_timeoutPrompt(const std::vector<TTSChunk>& timeoutPrompt_);
-    void reset_timeout(void);
-    bool set_timeout(unsigned int timeout_);
-    void reset_vrHelp(void);
-    bool set_vrHelp(const std::vector<VrHelpItem>& vrHelp_);
-
-  private:
-  
-    friend class PerformInteraction_requestMarshaller;
-
-
-///  Text to be displayed first.
-      std::string initialText;	//!< (500)
-
-/**
-     This is the intial prompt spoken to the user at the start of an interaction
-     An array of text chunks of type TTSChunk. See TTSChunk
-     The array must have at least one item
-*/
-      std::vector<TTSChunk> initialPrompt;	//!<   [%s..%s] 
-
-///  See InteractionMode.
-      InteractionMode interactionMode;
-
-///  List of interaction choice set IDs to use with an interaction.
-      std::vector<unsigned int> interactionChoiceSetIDList;	//!<   [%s..%s]  (0,2000000000)
-
-/**
-     Help text. This is the spoken string when a user speaks "help" when the interaction is occuring.
-     An array of text chunks of type TTSChunk. See TTSChunk
-     The array must have at least one item
-*/
-      std::vector<TTSChunk>* helpPrompt;	//!<   [%s..%s] 
-
-/**
-     Timeout text. This text is spoken when a VR interaction times out.
-     An array of text chunks of type TTSChunk. See TTSChunk
-     The array must have at least one item
-*/
-      std::vector<TTSChunk>* timeoutPrompt;	//!<   [%s..%s] 
-
-/**
-     Timeout in milliseconds.
-     If omitted a standard value of 10000 milliseconds is used.
-*/
-      unsigned int* timeout;	//!<  (5000,100000)
-
-/**
-     Ability to send suggested VR Help Items to display on-screen during Perform Interaction.
-     If omitted on supported displays, the default SYNC generated list of suggested choices shall be displayed.
-*/
-      std::vector<VrHelpItem>* vrHelp;	//!<   [%s..%s] 
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/PerformInteraction_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/PerformInteraction_response.h
deleted file mode 100644
index dedbcd738..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/PerformInteraction_response.h
+++ /dev/null
@@ -1,81 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_PERFORMINTERACTION_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_PERFORMINTERACTION_RESPONSE_INCLUDE
-
-#include "TriggerSource.h"
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    class PerformInteraction_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        PerformInteraction_response(const PerformInteraction_response& c);
-        PerformInteraction_response(void);
-
-        virtual ~PerformInteraction_response(void);
-
-        PerformInteraction_response& operator =(const PerformInteraction_response&);
-
-        bool checkIntegrity(void);
-
-        const unsigned int* get_choiceID(void) const;
-        const TriggerSource* get_triggerSource(void) const;
-
-        void reset_choiceID(void);
-        bool set_choiceID(unsigned int choiceID_);
-        void reset_triggerSource(void);
-        bool set_triggerSource(const TriggerSource& triggerSource_);
-
-    private:
-        friend class PerformInteraction_responseMarshaller;
-
-        ///  ID of the choice that was selected in response to PerformInteraction.
-        unsigned int* choiceID;   //!<  (0,2000000000)
-
-        ///  See TriggerSource
-        TriggerSource* triggerSource;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/PermissionItem.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/PermissionItem.h
deleted file mode 100644
index 9dc9634e2..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/PermissionItem.h
+++ /dev/null
@@ -1,88 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_PERMISSIONITEM_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_PERMISSIONITEM_INCLUDE
-
-#include <string>
-
-#include "HMIPermissions.h"
-#include "ParameterPermissions.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  class PermissionItem
-  {
-  public:
-  
-    PermissionItem(const PermissionItem& c);
-    PermissionItem(void);
-  
-    bool checkIntegrity(void);
-  // getters
-
-    const HMIPermissions& get_hmiPermissions(void) const;
-    const ParameterPermissions& get_parameterPermissions(void) const;
-    const std::string& get_rpcName(void) const;
-
-// setters
-
-    bool set_hmiPermissions(const HMIPermissions& hmiPermissions_);
-    bool set_parameterPermissions(const ParameterPermissions& parameterPermissions_);
-    bool set_rpcName(const std::string& rpcName_);
-
-  private:
-
-    friend class PermissionItemMarshaller;
-
-      HMIPermissions hmiPermissions;
-      ParameterPermissions parameterPermissions;
-
-///  Name of the individual RPC in the policy table.
-      std::string rpcName;	//!< (100)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/PermissionStatus.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/PermissionStatus.h
deleted file mode 100644
index bf2106b80..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/PermissionStatus.h
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_PERMISSIONSTATUS_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_PERMISSIONSTATUS_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Enumeration that describes possible permission states of a policy table entry.
-
-  class PermissionStatus
-  {
-  public:
-    enum PermissionStatusInternal
-    {
-      INVALID_ENUM=-1,
-      PS_ALLOWED=0,
-      PS_DISALLOWED=1,
-      PS_USER_DISALLOWED=2,
-      PS_USER_CONSENT_PENDING=3
-    };
-  
-    PermissionStatus() : mInternal(INVALID_ENUM)				{}
-    PermissionStatus(PermissionStatusInternal e) : mInternal(e)		{}
-  
-    PermissionStatusInternal get(void) const	{ return mInternal; }
-    void set(PermissionStatusInternal e)		{ mInternal=e; }
-  
-  private:
-    PermissionStatusInternal mInternal;
-    friend class PermissionStatusMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/PresetBankCapabilities.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/PresetBankCapabilities.h
deleted file mode 100644
index e03c772fd..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/PresetBankCapabilities.h
+++ /dev/null
@@ -1,81 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_PRESETBANKCAPABILITIES_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_PRESETBANKCAPABILITIES_INCLUDE
-
-
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Contains information about on-screen preset capabilities.
-
-  class PresetBankCapabilities
-  {
-  public:
-  
-    PresetBankCapabilities(const PresetBankCapabilities& c);
-    PresetBankCapabilities(void);
-  
-    bool checkIntegrity(void);
-  // getters
-
-    bool get_onScreenPresetsAvailable(void) const;
-
-// setters
-
-    bool set_onScreenPresetsAvailable(bool onScreenPresetsAvailable_);
-
-  private:
-
-    friend class PresetBankCapabilitiesMarshaller;
-
-
-///  Onscreen custom presets are available.
-      bool onScreenPresetsAvailable;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/PutFile_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/PutFile_request.h
deleted file mode 100644
index 3e5894778..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/PutFile_request.h
+++ /dev/null
@@ -1,110 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_PUTFILE_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_PUTFILE_REQUEST_INCLUDE
-
-#include <string>
-
-#include "FileType.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-/**
-     Used to push a binary data onto the SYNC module from a mobile device, such as icons and album art
-     Not supported on first generation SYNC vehicles. 
-*/
-
-  class PutFile_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    PutFile_request(const PutFile_request& c);
-    PutFile_request(void);
-    
-    virtual ~PutFile_request(void);
-  
-    PutFile_request& operator =(const PutFile_request&);
-  
-    bool checkIntegrity(void);
-
-    const std::string& get_syncFileName(void) const;
-    const FileType& get_fileType(void) const;
-    const bool* get_persistentFile(void) const;
-    const std::string* get_fileData(void) const;
-
-    bool set_syncFileName(const std::string& syncFileName_);
-    bool set_fileType(const FileType& fileType_);
-    void reset_persistentFile(void);
-    bool set_persistentFile(bool persistentFile_);
-    void reset_fileData(void);
-    bool set_fileData(const std::string& fileData_);
-
-  private:
-  
-    friend class PutFile_requestMarshaller;
-
-
-///  File reference name.
-      std::string syncFileName;	//!< (500)
-
-///  Selected file type.
-      FileType fileType;
-
-/**
-     Indicates if the file is meant to persist between sessions / ignition cycles.
-     If set to TRUE, then the system will aim to persist this file through session / cycles.
-     While files with this designation will have priority over others, they are subject to deletion by the system at any time.
-     In the event of automatic deletion by the system, the app will receive a rejection and have to resend the file.
-     If omitted, the value will be set to false.
-*/
-      bool* persistentFile;
-
-///  Binary data.
-      std::string* fileData;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/PutFile_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/PutFile_response.h
deleted file mode 100644
index 3f3750574..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/PutFile_response.h
+++ /dev/null
@@ -1,77 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_PUTFILE_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_PUTFILE_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    /**
-         Response is sent, when the file data was copied (success case). Or when an error occured.
-         Not supported on First generation SYNC vehicles.
-    */
-
-    class PutFile_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        PutFile_response(const PutFile_response& c);
-        PutFile_response(void);
-
-        virtual ~PutFile_response(void);
-
-        PutFile_response& operator =(const PutFile_response&);
-
-        bool checkIntegrity(void);
-
-        unsigned int get_spaceAvailable(void) const;
-        bool set_spaceAvailable(unsigned int spaceAvailable_);
-
-    private:
-        friend class PutFile_responseMarshaller;
-
-        ///  Provides the total local space available on SYNC for the registered app.
-        unsigned int spaceAvailable;  //!<  (0,2000000000)
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/RPC.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/RPC.h
deleted file mode 100644
index 77c7b73f5..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/RPC.h
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_RPC_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_RPC_INCLUDE
-
-#include <string>
-#include <json/json.h>
-
-#include "AppInterfaceUnregisteredReason.h"
-#include "AppType.h"
-#include "AudioCaptureQuality.h"
-#include "AudioStreamingState.h"
-#include "AudioType.h"
-#include "ButtonCapabilities.h"
-#include "ButtonEventMode.h"
-#include "ButtonName.h"
-#include "ButtonPressMode.h"
-#include "CharacterSet.h"
-#include "Choice.h"
-#include "CompassDirection.h"
-#include "DTC.h"
-#include "DeactivateReason.h"
-#include "Dimension.h"
-#include "DisplayCapabilities.h"
-#include "DisplayType.h"
-#include "DriverDistractionState.h"
-#include "FileType.h"
-#include "FunctionID.h"
-#include "GPSData.h"
-#include "GlobalProperty.h"
-#include "HMIApplication.h"
-#include "HMILevel.h"
-#include "HMIPermissions.h"
-#include "HmiZoneCapabilities.h"
-#include "Image.h"
-#include "ImageType.h"
-#include "InteractionMode.h"
-#include "Language.h"
-#include "MediaClockFormat.h"
-#include "MenuParams.h"
-#include "PRNDL.h"
-#include "ParameterPermissions.h"
-#include "PermissionItem.h"
-#include "PermissionStatus.h"
-#include "PresetBankCapabilities.h"
-#include "Result.h"
-#include "SamplingRate.h"
-#include "SingleTirePressureStatus.h"
-#include "SingleTireStatus.h"
-#include "SoftButton.h"
-#include "SoftButtonCapabilities.h"
-#include "SoftButtonType.h"
-#include "SpeechCapabilities.h"
-#include "StartTime.h"
-#include "SyncMsgVersion.h"
-#include "SystemAction.h"
-#include "SystemContext.h"
-#include "TBTState.h"
-#include "TTSChunk.h"
-#include "TextAlignment.h"
-#include "TextField.h"
-#include "TextFieldName.h"
-#include "TimerMode.h"
-#include "TirePressureTellTale.h"
-#include "TireStatus.h"
-#include "TriggerSource.h"
-#include "Turn.h"
-#include "UpdateMode.h"
-#include "VehicleDataResult.h"
-#include "VehicleDataResultCode.h"
-#include "VehicleDataType.h"
-#include "VehicleType.h"
-#include "VrCapabilities.h"
-#include "VrHelpItem.h"
-#include "messageType.h"
-#include "RegisterAppInterface_request.h"
-#include "RegisterAppInterface_response.h"
-#include "UnregisterAppInterface_request.h"
-#include "UnregisterAppInterface_response.h"
-#include "SetGlobalProperties_request.h"
-#include "SetGlobalProperties_response.h"
-#include "ResetGlobalProperties_request.h"
-#include "ResetGlobalProperties_response.h"
-#include "AddCommand_request.h"
-#include "AddCommand_response.h"
-#include "DeleteCommand_request.h"
-#include "DeleteCommand_response.h"
-#include "AddSubMenu_request.h"
-#include "AddSubMenu_response.h"
-#include "DeleteSubMenu_request.h"
-#include "DeleteSubMenu_response.h"
-#include "CreateInteractionChoiceSet_request.h"
-#include "CreateInteractionChoiceSet_response.h"
-#include "PerformInteraction_request.h"
-#include "PerformInteraction_response.h"
-#include "DeleteInteractionChoiceSet_request.h"
-#include "DeleteInteractionChoiceSet_response.h"
-#include "Alert_request.h"
-#include "Alert_response.h"
-#include "Show_request.h"
-#include "Show_response.h"
-#include "Speak_request.h"
-#include "Speak_response.h"
-#include "SetMediaClockTimer_request.h"
-#include "SetMediaClockTimer_response.h"
-#include "EncodedSyncPData_request.h"
-#include "EncodedSyncPData_response.h"
-#include "DialNumber_request.h"
-#include "DialNumber_response.h"
-#include "PerformAudioPassThru_request.h"
-#include "PerformAudioPassThru_response.h"
-#include "EndAudioPassThru_request.h"
-#include "EndAudioPassThru_response.h"
-#include "SubscribeButton_request.h"
-#include "SubscribeButton_response.h"
-#include "UnsubscribeButton_request.h"
-#include "UnsubscribeButton_response.h"
-#include "SubscribeVehicleData_request.h"
-#include "SubscribeVehicleData_response.h"
-#include "UnsubscribeVehicleData_request.h"
-#include "UnsubscribeVehicleData_response.h"
-#include "GetVehicleData_request.h"
-#include "GetVehicleData_response.h"
-#include "ReadDID_request.h"
-#include "ReadDID_response.h"
-#include "GetDTCs_request.h"
-#include "GetDTCs_response.h"
-#include "ScrollableMessage_request.h"
-#include "ScrollableMessage_response.h"
-#include "Slider_request.h"
-#include "Slider_response.h"
-#include "ShowConstantTBT_request.h"
-#include "ShowConstantTBT_response.h"
-#include "AlertManeuver_request.h"
-#include "AlertManeuver_response.h"
-#include "UpdateTurnList_request.h"
-#include "UpdateTurnList_response.h"
-#include "ChangeRegistration_request.h"
-#include "ChangeRegistration_response.h"
-#include "GenericResponse_response.h"
-#include "PutFile_request.h"
-#include "PutFile_response.h"
-#include "DeleteFile_request.h"
-#include "DeleteFile_response.h"
-#include "ListFiles_request.h"
-#include "ListFiles_response.h"
-#include "SetAppIcon_request.h"
-#include "SetAppIcon_response.h"
-#include "SetDisplayLayout_request.h"
-#include "SetDisplayLayout_response.h"
-#include "OnHMIStatus.h"
-#include "OnAppInterfaceUnregistered.h"
-#include "OnButtonEvent.h"
-#include "OnButtonPress.h"
-#include "OnVehicleData.h"
-#include "OnCommand.h"
-#include "OnEncodedSyncPData.h"
-#include "OnTBTClientState.h"
-#include "OnDriverDistraction.h"
-#include "OnPermissionsChange.h"
-#include "OnAudioPassThru.h"
-#include "OnLanguageChange.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ReadDID_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ReadDID_request.h
deleted file mode 100644
index 3ef61d928..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ReadDID_request.h
+++ /dev/null
@@ -1,98 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_READDID_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_READDID_REQUEST_INCLUDE
-
-#include <vector>
-
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Non periodic vehicle data read request.
-
-  class ReadDID_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    ReadDID_request(const ReadDID_request& c);
-    ReadDID_request(void);
-    
-    virtual ~ReadDID_request(void);
-  
-    ReadDID_request& operator =(const ReadDID_request&);
-  
-    bool checkIntegrity(void);
-
-    unsigned int get_ecuName(void) const;
-    const std::vector<unsigned int>& get_didLocation(void) const;
-    const bool* get_encrypted(void) const;
-
-    bool set_ecuName(unsigned int ecuName_);
-    bool set_didLocation(const std::vector<unsigned int>& didLocation_);
-    void reset_encrypted(void);
-    bool set_encrypted(bool encrypted_);
-
-  private:
-  
-    friend class ReadDID_requestMarshaller;
-
-
-///  Name of ECU.
-      unsigned int ecuName;	//!<  (0,65535)
-
-///  Get raw data from vehicle data DID location(s).
-      std::vector<unsigned int> didLocation;	//!<   [%s..%s]  (0,65535)
-
-/**
-     If not provided, the default is equal to False"
-     Indicates if the DID data requested should be returned as encrypted through an OnEncodedSYNCPData response.
-     If set to true, the data will return instead through OnEncodedSYNCPData and be passed through the proxy to the designated server URL.
-*/
-      bool* encrypted;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ReadDID_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ReadDID_response.h
deleted file mode 100644
index db7dc33f6..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ReadDID_response.h
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_READDID_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_READDID_RESPONSE_INCLUDE
-
-#include <vector>
-#include <string>
-
-#include "VehicleDataResultCode.h"
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    class ReadDID_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        ReadDID_response(const ReadDID_response& c);
-        ReadDID_response(void);
-
-        virtual ~ReadDID_response(void);
-
-        ReadDID_response& operator =(const ReadDID_response&);
-
-        bool checkIntegrity(void);
-
-        const std::vector<VehicleDataResultCode>* get_dataResult(void) const;
-        const std::vector<std::string>* get_data(void) const;
-
-        void reset_dataResult(void);
-        bool set_dataResult(const std::vector<VehicleDataResultCode>& dataResult_);
-        void reset_data(void);
-        bool set_data(const std::vector<std::string>& data_);
-
-    private:
-        friend class ReadDID_responseMarshaller;
-
-        ///  Permission status of data element.
-        std::vector<VehicleDataResultCode>* dataResult;   //!<   [%s..%s]
-
-        ///  Raw DID-based data returned for requested element.
-        std::vector<std::string>* data;   //!<   [%s..%s] (5000)
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/RegisterAppInterface_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/RegisterAppInterface_request.h
deleted file mode 100644
index 931b5f2dc..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/RegisterAppInterface_request.h
+++ /dev/null
@@ -1,180 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_REGISTERAPPINTERFACE_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_REGISTERAPPINTERFACE_REQUEST_INCLUDE
-
-#include <vector>
-#include <string>
-
-#include "AppType.h"
-#include "Language.h"
-#include "SyncMsgVersion.h"
-#include "TTSChunk.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-/**
-     Establishes an interface with a mobile application.
-     Before registerAppInterface no other commands will be accepted/executed.
-*/
-
-  class RegisterAppInterface_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    RegisterAppInterface_request(const RegisterAppInterface_request& c);
-    RegisterAppInterface_request(void);
-    
-    virtual ~RegisterAppInterface_request(void);
-  
-    RegisterAppInterface_request& operator =(const RegisterAppInterface_request&);
-  
-    bool checkIntegrity(void);
-
-    const SyncMsgVersion& get_syncMsgVersion(void) const;
-    const std::string& get_appName(void) const;
-    const std::vector<TTSChunk>* get_ttsName(void) const;
-    const std::string* get_ngnMediaScreenAppName(void) const;
-    const std::vector<std::string>* get_vrSynonyms(void) const;
-    bool get_isMediaApplication(void) const;
-    const Language& get_languageDesired(void) const;
-    const Language& get_hmiDisplayLanguageDesired(void) const;
-    const std::vector<AppType>* get_appType(void) const;
-    const std::string& get_appID(void) const;
-
-    bool set_syncMsgVersion(const SyncMsgVersion& syncMsgVersion_);
-    bool set_appName(const std::string& appName_);
-    void reset_ttsName(void);
-    bool set_ttsName(const std::vector<TTSChunk>& ttsName_);
-    void reset_ngnMediaScreenAppName(void);
-    bool set_ngnMediaScreenAppName(const std::string& ngnMediaScreenAppName_);
-    void reset_vrSynonyms(void);
-    bool set_vrSynonyms(const std::vector<std::string>& vrSynonyms_);
-    bool set_isMediaApplication(bool isMediaApplication_);
-    bool set_languageDesired(const Language& languageDesired_);
-    bool set_hmiDisplayLanguageDesired(const Language& hmiDisplayLanguageDesired_);
-    void reset_appType(void);
-    bool set_appType(const std::vector<AppType>& appType_);
-    bool set_appID(const std::string& appID_);
-
-  private:
-  
-    friend class RegisterAppInterface_requestMarshaller;
-
-
-///  See SyncMsgVersion
-      SyncMsgVersion syncMsgVersion;
-
-/**
-     The mobile application name, e.g. "Ford Drive Green".
-     Needs to be unique over all applications.
-     May not be empty.
-     May not start with a new line character.
-     May not interfere with any name or synonym of previously registered applications and the following list of words @TODO: Create list(global commands)
-     Needs to be unique over all applications. Applications with the same name will be rejected.
-     Only characters from char set [@TODO: Create char set (character/hex value) for each ACM and refer to] are supported.
-*/
-      std::string appName;	//!< (100)
-
-/**
-     TTS string for VR recognition of the mobile application name, e.g. "Ford Drive Green".
-     Meant to overcome any failing on speech engine in properly pronouncing / understanding app name.
-     Needs to be unique over all applications.
-     May not be empty.
-     May not start with a new line character.
-     May not interfere with any name or synonym of previously registered applications and the following list of words @TODO: Create list(global commands)
-     Needs to be unique over all applications. Applications with the same name will be rejected.
-     Only characters from char set [@TODO: Create char set (character/hex value) for each ACM and refer to] are supported.
-*/
-      std::vector<TTSChunk>* ttsName;	//!<   [%s..%s] 
-
-/**
-     Provides an abbreviated version of the app name (if needed), that will be displayed on the NGN media screen.
-     If not provided, the appName is used instead (and will be truncated if too long)
-     Only characters from char set [@TODO: Create char set (character/hex value) for each ACM and refer to] are supported.
-*/
-      std::string* ngnMediaScreenAppName;	//!< (100)
-
-/**
-     Defines an additional voice recognition command.
-     May not interfere with any name or synonym of previously registered applications and the following list of words @TODO: Create list(global commands)
-     Only characters from char set [@TODO: Create char set (character/hex value) for each ACM and refer to] are supported.
-*/
-      std::vector<std::string>* vrSynonyms;	//!<   [%s..%s] (40)
-
-/**
-     Indicates if the application is a media or a non-media application.
-     Only media applications will be able to stream audio to Sync that is audible outside of the BT media source.
-*/
-      bool isMediaApplication;
-
-/**
-     See Language
-     Current app’s expected VR+TTS language
-     If there is a mismatch with SYNC, the app will be able to change this registration with changeRegistration prior to app being brought into focus.
-*/
-      Language languageDesired;
-
-/**
-     See Language
-     Current app’s expected display language
-     If there is a mismatch with SYNC, the app will be able to change this registration with changeRegistration prior to app being brought into focus.
-*/
-      Language hmiDisplayLanguageDesired;
-
-/**
-     See AppType
-     List of all applicable app types stating which classifications to be given to the app.
-     e.g. for platforms like GEN2, this will determine which "corner(s)" the app can populate.
-*/
-      std::vector<AppType>* appType;	//!<   [%s..%s] 
-
-///  ID used to validate app with policy table entries
-      std::string appID;	//!< (100)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/RegisterAppInterface_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/RegisterAppInterface_response.h
deleted file mode 100644
index a2d310528..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/RegisterAppInterface_response.h
+++ /dev/null
@@ -1,154 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_REGISTERAPPINTERFACE_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_REGISTERAPPINTERFACE_RESPONSE_INCLUDE
-
-#include <vector>
-
-#include "ButtonCapabilities.h"
-#include "DisplayCapabilities.h"
-#include "HmiZoneCapabilities.h"
-#include "Language.h"
-#include "PresetBankCapabilities.h"
-#include "SoftButtonCapabilities.h"
-#include "SpeechCapabilities.h"
-#include "SyncMsgVersion.h"
-#include "VehicleType.h"
-#include "VrCapabilities.h"
-#include "JSONHandler/SDLRPCResponse.h"
-
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    ///  The response to registerAppInterface
-    class RegisterAppInterface_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        RegisterAppInterface_response(const RegisterAppInterface_response& c);
-        RegisterAppInterface_response(void);
-
-        virtual ~RegisterAppInterface_response(void);
-
-        RegisterAppInterface_response& operator =(const RegisterAppInterface_response&);
-
-        bool checkIntegrity(void);
-
-        const SyncMsgVersion* get_syncMsgVersion(void) const;
-        const Language* get_language(void) const;
-        const Language* get_hmiDisplayLanguage(void) const;
-        const DisplayCapabilities* get_displayCapabilities(void) const;
-        const std::vector<ButtonCapabilities>* get_buttonCapabilities(void) const;
-        const std::vector<SoftButtonCapabilities>* get_softButtonCapabilities(void) const;
-        const PresetBankCapabilities* get_presetBankCapabilities(void) const;
-        const std::vector<HmiZoneCapabilities>* get_hmiZoneCapabilities(void) const;
-        const std::vector<SpeechCapabilities>* get_speechCapabilities(void) const;
-        const std::vector<VrCapabilities>* get_vrCapabilities(void) const;
-        const VehicleType* get_vehicleType(void) const;
-
-        void reset_syncMsgVersion(void);
-        bool set_syncMsgVersion(const SyncMsgVersion& syncMsgVersion_);
-        void reset_language(void);
-        bool set_language(const Language& language_);
-        void reset_hmiDisplayLanguage(void);
-        bool set_hmiDisplayLanguage(const Language& hmiDisplayLanguage_);
-        void reset_displayCapabilities(void);
-        bool set_displayCapabilities(const DisplayCapabilities& displayCapabilities_);
-        void reset_buttonCapabilities(void);
-        bool set_buttonCapabilities(const std::vector<ButtonCapabilities>& buttonCapabilities_);
-        void reset_softButtonCapabilities(void);
-        bool set_softButtonCapabilities(const std::vector<SoftButtonCapabilities>& softButtonCapabilities_);
-        void reset_presetBankCapabilities(void);
-        bool set_presetBankCapabilities(const PresetBankCapabilities& presetBankCapabilities_);
-        void reset_hmiZoneCapabilities(void);
-        bool set_hmiZoneCapabilities(const std::vector<HmiZoneCapabilities>& hmiZoneCapabilities_);
-        void reset_speechCapabilities(void);
-        bool set_speechCapabilities(const std::vector<SpeechCapabilities>& speechCapabilities_);
-        void reset_vrCapabilities(void);
-        bool set_vrCapabilities(const std::vector<VrCapabilities>& vrCapabilities_);
-        void reset_vehicleType(void);
-        bool set_vehicleType(const VehicleType& vehicleType_);
-
-    private:
-        friend class RegisterAppInterface_responseMarshaller;
-
-        ///  See SyncMsgVersion
-        SyncMsgVersion* syncMsgVersion;
-
-        ///  The currently active VR+TTS language on Sync. See "Language" for options.
-        Language* language;
-
-        ///  The currently active display language on Sync. See "Language" for       options.
-        Language* hmiDisplayLanguage;
-
-        ///  See DisplayCapabilities
-        DisplayCapabilities* displayCapabilities;
-
-        ///  See ButtonCapabilities
-        std::vector<ButtonCapabilities>* buttonCapabilities;  //!<   [%s..%s]
-
-        /**
-             If returned, the platform supports on-screen SoftButtons.
-             See SoftButtonCapabilities
-        */
-        std::vector<SoftButtonCapabilities>* softButtonCapabilities;  //!<   [%s..%s]
-
-        /**
-             If returned, the platform supports custom on-screen Presets.
-             See PresetBankCapabilities
-        */
-        PresetBankCapabilities* presetBankCapabilities;
-
-        ///  See HmiZoneCapabilities
-        std::vector<HmiZoneCapabilities>* hmiZoneCapabilities;    //!<   [%s..%s]
-
-        ///  See SpeechCapabilities
-        std::vector<SpeechCapabilities>* speechCapabilities;  //!<   [%s..%s]
-
-        ///  See VrCapabilities
-        std::vector<VrCapabilities>* vrCapabilities;  //!<   [%s..%s]
-
-        ///  Specifies the vehicle's type. See VehicleType.
-        VehicleType* vehicleType;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ResetGlobalProperties_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ResetGlobalProperties_request.h
deleted file mode 100644
index 5e42e66c4..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ResetGlobalProperties_request.h
+++ /dev/null
@@ -1,82 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_RESETGLOBALPROPERTIES_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_RESETGLOBALPROPERTIES_REQUEST_INCLUDE
-
-#include <vector>
-
-#include "GlobalProperty.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Allows resetting global properties.
-
-  class ResetGlobalProperties_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    ResetGlobalProperties_request(const ResetGlobalProperties_request& c);
-    ResetGlobalProperties_request(void);
-    
-    virtual ~ResetGlobalProperties_request(void);
-  
-    bool checkIntegrity(void);
-
-    const std::vector<GlobalProperty>& get_properties(void) const;
-
-    bool set_properties(const std::vector<GlobalProperty>& properties_);
-
-  private:
-  
-    friend class ResetGlobalProperties_requestMarshaller;
-
-
-///  Contains the names of all global properties (like timeoutPrompt) that should be unset. Resetting means, that they have the same value as at start up (default)
-      std::vector<GlobalProperty> properties;	//!<   [%s..%s] 
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ResetGlobalProperties_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ResetGlobalProperties_response.h
deleted file mode 100644
index a38d6d262..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ResetGlobalProperties_response.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_RESETGLOBALPROPERTIES_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_RESETGLOBALPROPERTIES_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    class ResetGlobalProperties_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        ResetGlobalProperties_response(const ResetGlobalProperties_response& c);
-        ResetGlobalProperties_response(void);
-
-        virtual ~ResetGlobalProperties_response(void);
-
-        ResetGlobalProperties_response& operator =(const ResetGlobalProperties_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class ResetGlobalProperties_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Result.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Result.h
deleted file mode 100644
index 2f2f2e8b9..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Result.h
+++ /dev/null
@@ -1,201 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_RESULT_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_RESULT_INCLUDE
-
-namespace NsSmartDeviceLinkRPC
-{
-    class Result;
-}
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-    class Result
-    {
-    public:
-        enum ResultInternal
-        {
-            INVALID_ENUM = -1,
-
-            ///  The request succeeded
-            SUCCESS = 0,
-
-            /**
-                 The data sent is invalid. For example
-                 Invalid Json syntax
-                 Parameters out of bounds (number or enum range)
-                 Mandatory parameters not provided
-                 Parameter provided with wrong type
-                 Invalid characters
-                 Empty string
-            */
-            INVALID_DATA = 1,
-
-            ///  The request is not supported by Sync
-            UNSUPPORTED_REQUEST = 2,
-
-            ///  The system could not process the request because the necessary memory couldn't be allocated
-            OUT_OF_MEMORY = 3,
-
-            ///  There are too many requests pending (means, that the response has not been delivered, yet).
-            TOO_MANY_PENDING_REQUESTS = 4,
-
-            /**
-                 One of the provided IDs is not valid. For example
-                 This applies to CorrelationID, SubscriptionID [@TODO if SubscriptionID is used], CommandID, MenuID, [@TODO: missed one?]
-            */
-            INVALID_ID = 5,
-
-            ///  There was a conflict with an registered name (application or menu item) or vr command
-            DUPLICATE_NAME = 6,
-
-            ///  There are already too many registered applications
-            TOO_MANY_APPLICATIONS = 7,
-
-            ///  RegisterApplication has been called again, after a RegisterApplication was successful before.
-            APPLICATION_REGISTERED_ALREADY = 8,
-
-            ///  Sync doesn't support the protocol that is requested by the mobile application
-            UNSUPPORTED_VERSION = 9,
-
-            /**
-                 The requested language is currently not supported.
-                 Might be because of a mismatch of the currently active language on Sync and the requested language
-            */
-            WRONG_LANGUAGE = 10,
-
-            ///  An command can not be executed because no application has been registered with RegisterApplication.
-            APPLICATION_NOT_REGISTERED = 11,
-
-            /**
-                 The data may not be changed, because it is currently in use.
-                 For example when trying to delete a command set that is currently involved in an interaction.
-            */
-            IN_USE = 12,
-
-            ///  The item to subscribe to is already subscribed to.
-            SUBSCRIBED_ALREADY = 13,
-
-            /**
-                 The requested command was rejected, e.g. because mobile app is in background and cannot perform any HMI commands.
-                 Or an HMI command (e.g. Speak) is rejected because a higher priority HMI command (e.g. Alert) is playing.
-            */
-            REJECTED = 14,
-
-            /**
-                 A command was aborted, for example due to user interaction (e.g. user pressed button).
-                 Or an HMI command (e.g. Speak) is aborted because a higher priority HMI command (e.g. Alert) was requested.
-            */
-            ABORTED = 15,
-
-            /**
-                 A command was ignored, because the intended result is already in effect.
-                 For example, SetMediaClockTimer was used to pause the media clock although the clock is paused already.
-                 NOTE: potentially replaces SUBSCRIBED_ALREADY
-            */
-            IGNORED = 16,
-
-            /**
-                 A button that was requested for subscription is not supported under the current system.
-                 NOTE: could become a more generic UNSUPPORTED_RESOURCE by merging with VEHIVLE_DATA_NOT_AVAILABLE.
-            */
-            UNSUPPORTED_BUTTON = 17,
-
-            ///  A specified file could not be found on Sync.
-            FILE_NOT_FOUND = 18,
-
-            ///  Provided data is valid but something went wrong in the lower layers.
-            GENERIC_ERROR = 19,
-
-            ///  The user has turned off access to vehicle data, and it is globally unavailable to mobile applications.
-            VEHICLE_DATA_NOT_ALLOWED = 20,
-
-            ///  The requested vehicle data is not available on this vehicle or is not published.
-            VEHICLE_DATA_NOT_AVAILABLE = 21,
-
-            ///  RPC is not authorized in local policy table.
-            DISALLOWED = 22,
-
-            ///  RPC is included in a functional group explicitly blocked by the user.
-            USER_DISALLOWED = 23,
-
-            ///  Overlay reached the maximum timeout and closed.
-            TIMED_OUT = 24,
-
-            ///  User selected to Cancel Route.
-            CANCEL_ROUTE = 25,
-
-            ///  User chose a Close command for the overlay.
-            CLOSED = 26,
-
-            /**
-                 The data is being returned through an OnEncodedSYNCPData notification.
-                 The data is intended to be passed by the proxy to the designated server URL.
-            */
-            ENCRYPTED = 27,
-
-            ///  The RPC (e.g. SubscribeVehicleData) executed successfully but one or more items have a warning or failure.
-            WARNINGS = 28,
-
-            RETRY = 29 // PerformAudioPassThru
-        };
-
-        Result();
-        Result(ResultInternal e);
-        Result(const Result& r);
-
-        ResultInternal get(void) const;
-        void set(ResultInternal e);
-
-        // TODO(AK): remove this after new code generation
-        operator NsSmartDeviceLinkRPC::Result();
-        Result& operator= (const Result& result);
-
-    private:
-        ResultInternal mInternal;
-        friend class ResultMarshaller;
-    };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SamplingRate.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SamplingRate.h
deleted file mode 100644
index e01cd2891..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SamplingRate.h
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SAMPLINGRATE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SAMPLINGRATE_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Describes different sampling options for PerformAudioPassThru.
-
-  class SamplingRate
-  {
-  public:
-    enum SamplingRateInternal
-    {
-      INVALID_ENUM=-1,
-      FIX_8KHZ=0,
-      FIX_16KHZ=1,
-      FIX_22KHZ=2,
-      FIX_44KHZ=3
-    };
-  
-    SamplingRate() : mInternal(INVALID_ENUM)				{}
-    SamplingRate(SamplingRateInternal e) : mInternal(e)		{}
-  
-    SamplingRateInternal get(void) const	{ return mInternal; }
-    void set(SamplingRateInternal e)		{ mInternal=e; }
-  
-  private:
-    SamplingRateInternal mInternal;
-    friend class SamplingRateMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ScrollableMessage_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ScrollableMessage_request.h
deleted file mode 100644
index b2b33f80f..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ScrollableMessage_request.h
+++ /dev/null
@@ -1,100 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SCROLLABLEMESSAGE_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SCROLLABLEMESSAGE_REQUEST_INCLUDE
-
-#include <vector>
-#include <string>
-
-#include "SoftButton.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Creates a full screen overlay containing a large block of formatted text that can be scrolled with up to 8 SoftButtons defined
-
-  class ScrollableMessage_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    ScrollableMessage_request(const ScrollableMessage_request& c);
-    ScrollableMessage_request(void);
-    
-    virtual ~ScrollableMessage_request(void);
-  
-    ScrollableMessage_request& operator =(const ScrollableMessage_request&);
-  
-    bool checkIntegrity(void);
-
-    const std::string& get_scrollableMessageBody(void) const;
-    const unsigned int* get_timeout(void) const;
-    const std::vector<SoftButton>* get_softButtons(void) const;
-
-    bool set_scrollableMessageBody(const std::string& scrollableMessageBody_);
-    void reset_timeout(void);
-    bool set_timeout(unsigned int timeout_);
-    void reset_softButtons(void);
-    bool set_softButtons(const std::vector<SoftButton>& softButtons_);
-
-  private:
-  
-    friend class ScrollableMessage_requestMarshaller;
-
-
-///  Body of text that can include newlines and tabs.
-      std::string scrollableMessageBody;	//!< (500)
-
-///  App defined timeout.
-      unsigned int* timeout;	//!<  (0,65535)
-
-/**
-     App defined SoftButtons.
-     If omitted on supported displays, only the system defined "Close" SoftButton will be displayed.
-*/
-      std::vector<SoftButton>* softButtons;	//!<   [%s..%s] 
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ScrollableMessage_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ScrollableMessage_response.h
deleted file mode 100644
index 643be3761..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ScrollableMessage_response.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SCROLLABLEMESSAGE_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SCROLLABLEMESSAGE_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    class ScrollableMessage_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        ScrollableMessage_response(const ScrollableMessage_response& c);
-        ScrollableMessage_response(void);
-
-        virtual ~ScrollableMessage_response(void);
-
-        ScrollableMessage_response& operator =(const ScrollableMessage_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class ScrollableMessage_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SetAppIcon_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SetAppIcon_request.h
deleted file mode 100644
index c1838018f..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SetAppIcon_request.h
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SETAPPICON_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SETAPPICON_REQUEST_INCLUDE
-
-#include <string>
-
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-/**
-     Used to set existing local file on SYNC as the app's icon
-     Not supported on first generation SYNC vehicles. 
-*/
-
-  class SetAppIcon_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    SetAppIcon_request(const SetAppIcon_request& c);
-    SetAppIcon_request(void);
-    
-    virtual ~SetAppIcon_request(void);
-  
-    bool checkIntegrity(void);
-
-    const std::string& get_syncFileName(void) const;
-
-    bool set_syncFileName(const std::string& syncFileName_);
-
-  private:
-  
-    friend class SetAppIcon_requestMarshaller;
-
-
-///  File reference name.
-      std::string syncFileName;	//!< (500)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SetAppIcon_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SetAppIcon_response.h
deleted file mode 100644
index a31c4705a..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SetAppIcon_response.h
+++ /dev/null
@@ -1,72 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SETAPPICON_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SETAPPICON_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    /**
-         Response is sent, when the file data was copied (success case). Or when an error occured.
-         Not supported on First generation SYNC vehicles.
-         Response is sent, when the file data was copied (success case). Or when an error occured.
-         Not supported on First generation SYNC vehicles.
-    */
-    class SetAppIcon_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        SetAppIcon_response(const SetAppIcon_response& c);
-        SetAppIcon_response(void);
-
-        virtual ~SetAppIcon_response(void);
-
-        SetAppIcon_response& operator =(const SetAppIcon_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class SetAppIcon_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SetDisplayLayout_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SetDisplayLayout_request.h
deleted file mode 100644
index 2fbb4190a..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SetDisplayLayout_request.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SETDISPLAYLAYOUT_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SETDISPLAYLAYOUT_REQUEST_INCLUDE
-
-#include <string>
-
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-/**
-     Used to set an alternate display layout.
-     If not sent, default screen for given platform will be shown.
-*/
-
-  class SetDisplayLayout_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    SetDisplayLayout_request(const SetDisplayLayout_request& c);
-    SetDisplayLayout_request(void);
-    
-    virtual ~SetDisplayLayout_request(void);
-  
-    bool checkIntegrity(void);
-
-    const std::string& get_displayLayout(void) const;
-
-    bool set_displayLayout(const std::string& displayLayout_);
-
-  private:
-  
-    friend class SetDisplayLayout_requestMarshaller;
-
-
-/**
-     Predefined or dynamically created screen layout.
-     Currently only predefined screen layouts are defined.
-     Predefined layouts include:
-       "ONSCREEN_PRESETS"
-         Custom screen containing app-defined onscreen presets.  Currently defined for GEN2.
-*/
-      std::string displayLayout;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SetDisplayLayout_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SetDisplayLayout_response.h
deleted file mode 100644
index 137687cc5..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SetDisplayLayout_response.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SETDISPLAYLAYOUT_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SETDISPLAYLAYOUT_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    class SetDisplayLayout_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        SetDisplayLayout_response(const SetDisplayLayout_response& c);
-        SetDisplayLayout_response(void);
-
-        virtual ~SetDisplayLayout_response(void);
-
-        SetDisplayLayout_response& operator =(const SetDisplayLayout_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class SetDisplayLayout_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SetGlobalProperties_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SetGlobalProperties_request.h
deleted file mode 100644
index bf87ef030..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SetGlobalProperties_request.h
+++ /dev/null
@@ -1,120 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SETGLOBALPROPERTIES_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SETGLOBALPROPERTIES_REQUEST_INCLUDE
-
-#include <vector>
-#include <string>
-
-#include "TTSChunk.h"
-#include "VrHelpItem.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Allows setting global properties.
-
-  class SetGlobalProperties_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    SetGlobalProperties_request(const SetGlobalProperties_request& c);
-    SetGlobalProperties_request(void);
-    
-    virtual ~SetGlobalProperties_request(void);
-  
-    SetGlobalProperties_request& operator =(const SetGlobalProperties_request&);
-  
-    bool checkIntegrity(void);
-
-    const std::vector<TTSChunk>* get_helpPrompt(void) const;
-    const std::vector<TTSChunk>* get_timeoutPrompt(void) const;
-    const std::string* get_vrHelpTitle(void) const;
-    const std::vector<VrHelpItem>* get_vrHelp(void) const;
-
-    void reset_helpPrompt(void);
-    bool set_helpPrompt(const std::vector<TTSChunk>& helpPrompt_);
-    void reset_timeoutPrompt(void);
-    bool set_timeoutPrompt(const std::vector<TTSChunk>& timeoutPrompt_);
-    void reset_vrHelpTitle(void);
-    bool set_vrHelpTitle(const std::string& vrHelpTitle_);
-    void reset_vrHelp(void);
-    bool set_vrHelp(const std::vector<VrHelpItem>& vrHelp_);
-
-  private:
-  
-    friend class SetGlobalProperties_requestMarshaller;
-
-
-/**
-     The help prompt.
-     An array of text chunks of type TTSChunk. See TTSChunk
-     The array must have at least one item
-*/
-      std::vector<TTSChunk>* helpPrompt;	//!<   [%s..%s] 
-
-/**
-     Help text for a wait timeout.
-     An array of text chunks of type TTSChunk. See TTSChunk
-     The array must have at least one item
-*/
-      std::vector<TTSChunk>* timeoutPrompt;	//!<   [%s..%s] 
-
-/**
-     VR Help Title text.
-     If omitted on supported displays, the default SYNC help title shall be used.
-*/
-      std::string* vrHelpTitle;	//!< (500)
-
-/**
-     VR Help Items.
-     If omitted on supported displays, the default SYNC generated help items shall be used.
-     If the list of VR Help Items contains nonsequential positions (e.g. [1,2,4]), the RPC shall be rejected.
-*/
-      std::vector<VrHelpItem>* vrHelp;	//!<   [%s..%s] 
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SetGlobalProperties_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SetGlobalProperties_response.h
deleted file mode 100644
index fcaafff97..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SetGlobalProperties_response.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SETGLOBALPROPERTIES_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SETGLOBALPROPERTIES_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    class SetGlobalProperties_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        SetGlobalProperties_response(const SetGlobalProperties_response& c);
-        SetGlobalProperties_response(void);
-
-        virtual ~SetGlobalProperties_response(void);
-
-        SetGlobalProperties_response& operator =(const SetGlobalProperties_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class SetGlobalProperties_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SetMediaClockTimer_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SetMediaClockTimer_request.h
deleted file mode 100644
index 4f126a4f8..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SetMediaClockTimer_request.h
+++ /dev/null
@@ -1,97 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SETMEDIACLOCKTIMER_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SETMEDIACLOCKTIMER_REQUEST_INCLUDE
-
-
-#include "StartTime.h"
-#include "UpdateMode.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Sets the initial media clock value and automatic update method.
-
-  class SetMediaClockTimer_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    SetMediaClockTimer_request(const SetMediaClockTimer_request& c);
-    SetMediaClockTimer_request(void);
-    
-    virtual ~SetMediaClockTimer_request(void);
-  
-    SetMediaClockTimer_request& operator =(const SetMediaClockTimer_request&);
-  
-    bool checkIntegrity(void);
-
-    const StartTime* get_startTime(void) const;
-    const UpdateMode& get_updateMode(void) const;
-
-    void reset_startTime(void);
-    bool set_startTime(const StartTime& startTime_);
-    bool set_updateMode(const UpdateMode& updateMode_);
-
-  private:
-  
-    friend class SetMediaClockTimer_requestMarshaller;
-
-
-/**
-     See StartTime
-     startTime must be provided for "COUNTUP" and "COUNTDOWN"
-     startTime will be ignored for "PAUSE", "RESUME", and "CLEAR"
-*/
-      StartTime* startTime;
-
-/**
-     Enumeration to control the media clock.
-     In case of pause, resume, or clear, the start time value is ignored and shall be left out.  For resume, the time continues with the same value as it was when paused.
-*/
-      UpdateMode updateMode;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SetMediaClockTimer_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SetMediaClockTimer_response.h
deleted file mode 100644
index 9058c2a56..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SetMediaClockTimer_response.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SETMEDIACLOCKTIMER_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SETMEDIACLOCKTIMER_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    class SetMediaClockTimer_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        SetMediaClockTimer_response(const SetMediaClockTimer_response& c);
-        SetMediaClockTimer_response(void);
-
-        virtual ~SetMediaClockTimer_response(void);
-
-        SetMediaClockTimer_response& operator =(const SetMediaClockTimer_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class SetMediaClockTimer_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ShowConstantTBT_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ShowConstantTBT_request.h
deleted file mode 100644
index 6ac2e6961..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ShowConstantTBT_request.h
+++ /dev/null
@@ -1,131 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SHOWCONSTANTTBT_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SHOWCONSTANTTBT_REQUEST_INCLUDE
-
-#include <vector>
-#include <string>
-
-#include "Image.h"
-#include "SoftButton.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  class ShowConstantTBT_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    ShowConstantTBT_request(const ShowConstantTBT_request& c);
-    ShowConstantTBT_request(void);
-    
-    virtual ~ShowConstantTBT_request(void);
-  
-    ShowConstantTBT_request& operator =(const ShowConstantTBT_request&);
-  
-    bool checkIntegrity(void);
-
-    const std::string* get_navigationText1(void) const;
-    const std::string* get_navigationText2(void) const;
-    const std::string* get_eta(void) const;
-    const std::string* get_totalDistance(void) const;
-    const Image& get_turnIcon(void) const;
-    float get_distanceToManeuver(void) const;
-    float get_distanceToManeuverScale(void) const;
-    const bool* get_maneuverComplete(void) const;
-    const std::vector<SoftButton>& get_softButtons(void) const;
-
-    void reset_navigationText1(void);
-    bool set_navigationText1(const std::string& navigationText1_);
-    void reset_navigationText2(void);
-    bool set_navigationText2(const std::string& navigationText2_);
-    void reset_eta(void);
-    bool set_eta(const std::string& eta_);
-    void reset_totalDistance(void);
-    bool set_totalDistance(const std::string& totalDistance_);
-    bool set_turnIcon(const Image& turnIcon_);
-    bool set_distanceToManeuver(float distanceToManeuver_);
-    bool set_distanceToManeuverScale(float distanceToManeuverScale_);
-    void reset_maneuverComplete(void);
-    bool set_maneuverComplete(bool maneuverComplete_);
-    bool set_softButtons(const std::vector<SoftButton>& softButtons_);
-
-  private:
-  
-    friend class ShowConstantTBT_requestMarshaller;
-
-      std::string* navigationText1;	//!< (500)
-      std::string* navigationText2;	//!< (500)
-      std::string* eta;	//!< (500)
-      std::string* totalDistance;	//!< (500)
-      Image turnIcon;
-
-/**
-     Distance till next maneuver (starting from) from previous maneuver.
-     Used to calculate progress bar.
-*/
-      float distanceToManeuver;	//!<  (0,1000000000)
-
-/**
-     Fraction of distance till next maneuver (starting from when AlertManeuver is triggered).
-     Used to calculate progress bar.
-*/
-      float distanceToManeuverScale;	//!<  (0,1000000000)
-
-/**
-     If and when a maneuver has completed while an AlertManeuver is active, the app must send this value set to TRUE in order to clear the AlertManeuver overlay.
-     If omitted the value will be assumed as FALSE.
-*/
-      bool* maneuverComplete;
-
-/**
-     Three dynamic SoftButtons available (second SoftButton is fixed to "Turns").
-     If omitted on supported displays, the currently displayed SoftButton values will not change.
-*/
-      std::vector<SoftButton> softButtons;	//!<   [%s..%s] 
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ShowConstantTBT_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ShowConstantTBT_response.h
deleted file mode 100644
index eb9b342ed..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/ShowConstantTBT_response.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SHOWCONSTANTTBT_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SHOWCONSTANTTBT_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    class ShowConstantTBT_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        ShowConstantTBT_response(const ShowConstantTBT_response& c);
-        ShowConstantTBT_response(void);
-
-        virtual ~ShowConstantTBT_response(void);
-
-        ShowConstantTBT_response& operator =(const ShowConstantTBT_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class ShowConstantTBT_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Show_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Show_request.h
deleted file mode 100644
index 2126485e0..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Show_request.h
+++ /dev/null
@@ -1,184 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SHOW_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SHOW_REQUEST_INCLUDE
-
-#include <vector>
-#include <string>
-
-#include "Image.h"
-#include "SoftButton.h"
-#include "TextAlignment.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Updates the persistent display. Supported fields depend on display capabilities.
-
-  class Show_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    Show_request(const Show_request& c);
-    Show_request(void);
-    
-    virtual ~Show_request(void);
-  
-    Show_request& operator =(const Show_request&);
-  
-    bool checkIntegrity(void);
-
-    const std::string* get_mainField1(void) const;
-    const std::string* get_mainField2(void) const;
-    const std::string* get_mainField3(void) const;
-    const std::string* get_mainField4(void) const;
-    const TextAlignment* get_alignment(void) const;
-    const std::string* get_statusBar(void) const;
-    const std::string* get_mediaClock(void) const;
-    const std::string* get_mediaTrack(void) const;
-    const Image* get_graphic(void) const;
-    const std::vector<SoftButton>* get_softButtons(void) const;
-    const std::vector<std::string>* get_customPresets(void) const;
-
-    void reset_mainField1(void);
-    bool set_mainField1(const std::string& mainField1_);
-    void reset_mainField2(void);
-    bool set_mainField2(const std::string& mainField2_);
-    void reset_mainField3(void);
-    bool set_mainField3(const std::string& mainField3_);
-    void reset_mainField4(void);
-    bool set_mainField4(const std::string& mainField4_);
-    void reset_alignment(void);
-    bool set_alignment(const TextAlignment& alignment_);
-    void reset_statusBar(void);
-    bool set_statusBar(const std::string& statusBar_);
-    void reset_mediaClock(void);
-    bool set_mediaClock(const std::string& mediaClock_);
-    void reset_mediaTrack(void);
-    bool set_mediaTrack(const std::string& mediaTrack_);
-    void reset_graphic(void);
-    bool set_graphic(const Image& graphic_);
-    void reset_softButtons(void);
-    bool set_softButtons(const std::vector<SoftButton>& softButtons_);
-    void reset_customPresets(void);
-    bool set_customPresets(const std::vector<std::string>& customPresets_);
-
-  private:
-  
-    friend class Show_requestMarshaller;
-
-
-/**
-     The text that should be displayed in a single or upper display line.
-     If this text is not set, the text of mainField1 stays unchanged.
-     If this text is empty "", the field will be cleared.
-*/
-      std::string* mainField1;	//!< (500)
-
-/**
-     The text that should be displayed on the second display line.
-     If this text is not set, the text of mainField2 stays unchanged.
-     If this text is empty "", the field will be cleared.
-*/
-      std::string* mainField2;	//!< (500)
-
-/**
-     The text that should be displayed on the second "page" first display line.
-     If this text is not set, the text of mainField3 stays unchanged.
-     If this text is empty "", the field will be cleared.
-*/
-      std::string* mainField3;	//!< (500)
-
-/**
-     The text that should be displayed on the second "page" second display line.
-     If this text is not set, the text of mainField4 stays unchanged.
-     If this text is empty "", the field will be cleared.
-*/
-      std::string* mainField4;	//!< (500)
-
-/**
-     Specifies how mainField1 and mainField2 texts should be aligned on display.
-     If omitted, texts will be centered
-*/
-      TextAlignment* alignment;
-
-///  Requires investigation regarding the nav display capabilities. Potentially lower lowerStatusBar, upperStatusBar, titleBar, etc.
-      std::string* statusBar;	//!< (500)
-
-/**
-     Text value for MediaClock field. Has to be properly formatted by Mobile App according to Sync capabilities.
-     If this text is set, any automatic media clock updates previously set with SetMediaClockTimer will be stopped.
-*/
-      std::string* mediaClock;	//!< (500)
-
-/**
-     The text that should be displayed in the track field.
-     This field is only valid for media applications on NGN type ACMs.
-     If this text is not set, the text of mediaTrack stays unchanged.
-     If this text is empty "", the field will be cleared.
-*/
-      std::string* mediaTrack;	//!< (500)
-
-/**
-     Image struct determining whether static or dynamic image to display in app.
-     If omitted on supported displays, the displayed graphic shall not change.
-*/
-      Image* graphic;
-
-/**
-     App defined SoftButtons.
-     If omitted on supported displays, the currently displayed SoftButton values will not change.
-*/
-      std::vector<SoftButton>* softButtons;	//!<   [%s..%s] 
-
-/**
-     App labeled on-screen presets (i.e. GEN2).
-     If omitted on supported displays, the presets will be shown as not defined.
-*/
-      std::vector<std::string>* customPresets;	//!<   [%s..%s] (500)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Show_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Show_response.h
deleted file mode 100644
index 8c44b8d5c..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Show_response.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SHOW_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SHOW_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    class Show_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        Show_response(const Show_response& c);
-        Show_response(void);
-
-        virtual ~Show_response(void);
-
-        Show_response& operator =(const Show_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class Show_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SingleTirePressureStatus.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SingleTirePressureStatus.h
deleted file mode 100644
index 435a56bf5..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SingleTirePressureStatus.h
+++ /dev/null
@@ -1,77 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SINGLETIREPRESSURESTATUS_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SINGLETIREPRESSURESTATUS_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  The pressure status of a tire.
-
-  class SingleTirePressureStatus
-  {
-  public:
-    enum SingleTirePressureStatusInternal
-    {
-      INVALID_ENUM=-1,
-      UNKNOWN=0,
-      NORMAL=1,
-      LOW=2,
-      FAULT=3,
-      NOT_SUPPORTED=4
-    };
-  
-    SingleTirePressureStatus() : mInternal(INVALID_ENUM)				{}
-    SingleTirePressureStatus(SingleTirePressureStatusInternal e) : mInternal(e)		{}
-  
-    SingleTirePressureStatusInternal get(void) const	{ return mInternal; }
-    void set(SingleTirePressureStatusInternal e)		{ mInternal=e; }
-  
-  private:
-    SingleTirePressureStatusInternal mInternal;
-    friend class SingleTirePressureStatusMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SingleTireStatus.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SingleTireStatus.h
deleted file mode 100644
index df99ace19..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SingleTireStatus.h
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SINGLETIRESTATUS_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SINGLETIRESTATUS_INCLUDE
-
-
-#include "SingleTirePressureStatus.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  class SingleTireStatus
-  {
-  public:
-  
-    SingleTireStatus(const SingleTireStatus& c);
-    SingleTireStatus(void);
-  
-    bool checkIntegrity(void);
-  // getters
-
-    unsigned int get_pressure(void) const;
-    const SingleTirePressureStatus& get_status(void) const;
-
-// setters
-
-    bool set_pressure(unsigned int pressure_);
-    bool set_status(const SingleTirePressureStatus& status_);
-
-  private:
-
-    friend class SingleTireStatusMarshaller;
-
-
-///  The tire pressure in PSI.
-      unsigned int pressure;	//!<  (0,255)
-
-///  See SingleTirePressureStatus.
-      SingleTirePressureStatus status;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Slider_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Slider_request.h
deleted file mode 100644
index 3e7716d1d..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Slider_request.h
+++ /dev/null
@@ -1,111 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SLIDER_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SLIDER_REQUEST_INCLUDE
-
-#include <vector>
-#include <string>
-
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Creates a full screen or pop-up overlay (depending on platform) with a single user controlled slider.
-
-  class Slider_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    Slider_request(const Slider_request& c);
-    Slider_request(void);
-    
-    virtual ~Slider_request(void);
-  
-    Slider_request& operator =(const Slider_request&);
-  
-    bool checkIntegrity(void);
-
-    unsigned int get_numTicks(void) const;
-    unsigned int get_position(void) const;
-    const std::string& get_sliderHeader(void) const;
-    const std::vector<std::string>* get_sliderFooter(void) const;
-    unsigned int get_timeout(void) const;
-
-    bool set_numTicks(unsigned int numTicks_);
-    bool set_position(unsigned int position_);
-    bool set_sliderHeader(const std::string& sliderHeader_);
-    void reset_sliderFooter(void);
-    bool set_sliderFooter(const std::vector<std::string>& sliderFooter_);
-    bool set_timeout(unsigned int timeout_);
-
-  private:
-  
-    friend class Slider_requestMarshaller;
-
-
-///  Number of selectable items on a horizontal axis
-      unsigned int numTicks;	//!<  (2,26)
-
-///  Initial position of slider control (cannot exceed numTicks)
-      unsigned int position;	//!<  (1,26)
-
-///  Text header to display
-      std::string sliderHeader;	//!< (500)
-
-/**
-     Text footer to display (meant to display min/max threshold descriptors).
-     For a static text footer, only one footer string shall be provided in the array.
-     For a dynamic text footer, the number of footer text string in the array must match the numTicks value.
-     For a dynamic text footer, text array string should correlate with potential slider position index.
-     If omitted on supported displays, no footer text shall be displayed.
-*/
-      std::vector<std::string>* sliderFooter;	//!<   [%s..%s] (500)
-
-///  App defined timeout.
-      unsigned int timeout;	//!<  (0,65535)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Slider_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Slider_response.h
deleted file mode 100644
index e89602372..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Slider_response.h
+++ /dev/null
@@ -1,72 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SLIDER_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SLIDER_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    class Slider_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        Slider_response(const Slider_response& c);
-        Slider_response(void);
-
-        virtual ~Slider_response(void);
-
-        Slider_response& operator =(const Slider_response& c);
-
-        bool checkIntegrity(void);
-
-        unsigned int get_sliderPosition(void) const;
-        bool set_sliderPosition(unsigned int sliderPosition_);
-
-    private:
-        friend class Slider_responseMarshaller;
-
-        ///  Current slider value returned when saved or canceled
-        unsigned int sliderPosition;  //!<  (1,26)
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SoftButton.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SoftButton.h
deleted file mode 100644
index 385ebe717..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SoftButton.h
+++ /dev/null
@@ -1,117 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SOFTBUTTON_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SOFTBUTTON_INCLUDE
-
-#include <string>
-
-#include "Image.h"
-#include "SystemAction.h"
-#include "SoftButtonType.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  class SoftButton
-  {
-  public:
-  
-    SoftButton(const SoftButton& c);
-    SoftButton(void);
-  
-    bool checkIntegrity(void);
-  
-    ~SoftButton(void);
-    SoftButton& operator =(const SoftButton&);
-
-// getters
-
-    const Image* get_image(void) const;
-    bool get_isHighlighted(void) const;
-    unsigned int get_softButtonID(void) const;
-    const SystemAction& get_systemAction(void) const;
-    const std::string* get_text(void) const;
-    const SoftButtonType& get_type(void) const;
-
-// setters
-
-    void reset_image(void);
-    bool set_image(const Image& image_);
-    bool set_isHighlighted(bool isHighlighted_);
-    bool set_softButtonID(unsigned int softButtonID_);
-    bool set_systemAction(const SystemAction& systemAction_);
-    void reset_text(void);
-    bool set_text(const std::string& text_);
-    bool set_type(const SoftButtonType& type_);
-
-  private:
-
-    friend class SoftButtonMarshaller;
-
-
-///  Optional image struct for SoftButton (if defined as IMAGE or BOTH)
-      Image* image;
-
-/**
-     True, if highlighted
-     False, if not highlighted
-*/
-      bool isHighlighted;
-
-///  Value which is returned via OnButtonPress / OnButtonEvent
-      unsigned int softButtonID;	//!<  (0,65536)
-
-///  Parameter indicating whether selecting a SoftButton shall call a specific system action.  This is intended to allow Notifications to bring the callee into full / focus; or in the case of persistent overlays, the overlay can persist when a SoftButton is pressed.
-      SystemAction systemAction;
-
-///  Optional text to display (if defined as TEXT or BOTH)
-      std::string* text;	//!< (500)
-
-///  Describes, whether it is text, highlighted text, icon, or dynamic image. See softButtonType
-      SoftButtonType type;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SoftButtonCapabilities.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SoftButtonCapabilities.h
deleted file mode 100644
index 241fccb47..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SoftButtonCapabilities.h
+++ /dev/null
@@ -1,106 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SOFTBUTTONCAPABILITIES_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SOFTBUTTONCAPABILITIES_INCLUDE
-
-
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Contains information about a SoftButton's capabilities.
-
-  class SoftButtonCapabilities
-  {
-  public:
-  
-    SoftButtonCapabilities(const SoftButtonCapabilities& c);
-    SoftButtonCapabilities(void);
-  
-    bool checkIntegrity(void);
-  // getters
-
-    bool get_imageSupported(void) const;
-    bool get_longPressAvailable(void) const;
-    bool get_shortPressAvailable(void) const;
-    bool get_upDownAvailable(void) const;
-
-// setters
-
-    bool set_imageSupported(bool imageSupported_);
-    bool set_longPressAvailable(bool longPressAvailable_);
-    bool set_shortPressAvailable(bool shortPressAvailable_);
-    bool set_upDownAvailable(bool upDownAvailable_);
-
-  private:
-
-    friend class SoftButtonCapabilitiesMarshaller;
-
-
-///  The button supports referencing a static or dynamic image.
-      bool imageSupported;
-
-/**
-     The button supports a LONG press.
-     Whenever the button is pressed long, onButtonPressed( LONG) will be invoked.
-*/
-      bool longPressAvailable;
-
-/**
-     The button supports a short press.
-     Whenever the button is pressed short, onButtonPressed( SHORT) will be invoked.
-*/
-      bool shortPressAvailable;
-
-/**
-     The button supports "button down" and "button up".
-     Whenever the button is pressed, onButtonEvent( DOWN) will be invoked.
-     Whenever the button is released, onButtonEvent( UP) will be invoked.
-*/
-      bool upDownAvailable;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SoftButtonType.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SoftButtonType.h
deleted file mode 100644
index 06843f8f3..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SoftButtonType.h
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SOFTBUTTONTYPE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SOFTBUTTONTYPE_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Contains information about the SoftButton capabilities.
-
-  class SoftButtonType
-  {
-  public:
-    enum SoftButtonTypeInternal
-    {
-      INVALID_ENUM=-1,
-      SBT_TEXT=0,
-      SBT_IMAGE=1,
-      SBT_BOTH=2
-    };
-  
-    SoftButtonType() : mInternal(INVALID_ENUM)				{}
-    SoftButtonType(SoftButtonTypeInternal e) : mInternal(e)		{}
-  
-    SoftButtonTypeInternal get(void) const	{ return mInternal; }
-    void set(SoftButtonTypeInternal e)		{ mInternal=e; }
-  
-  private:
-    SoftButtonTypeInternal mInternal;
-    friend class SoftButtonTypeMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Speak_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Speak_request.h
deleted file mode 100644
index 71859f874..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Speak_request.h
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SPEAK_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SPEAK_REQUEST_INCLUDE
-
-#include <vector>
-
-#include "TTSChunk.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Speaks a text.
-
-  class Speak_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    Speak_request(const Speak_request& c);
-    Speak_request(void);
-    
-    virtual ~Speak_request(void);
-  
-    bool checkIntegrity(void);
-
-    const std::vector<TTSChunk>& get_ttsChunks(void) const;
-
-    bool set_ttsChunks(const std::vector<TTSChunk>& ttsChunks_);
-
-  private:
-  
-    friend class Speak_requestMarshaller;
-
-
-/**
-     An array of text chunks of type TTSChunk. See TTSChunk
-     The array must have at least one item
-*/
-      std::vector<TTSChunk> ttsChunks;	//!<   [%s..%s] 
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Speak_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Speak_response.h
deleted file mode 100644
index 055a65f68..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Speak_response.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SPEAK_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SPEAK_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-  class Speak_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-  {
-  public:
-    Speak_response(const Speak_response& c);
-    Speak_response(void);
-
-    virtual ~Speak_response(void);
-
-    Speak_response& operator =(const Speak_response&);
-
-    bool checkIntegrity(void);
-
-  private:
-    friend class Speak_responseMarshaller;
-  };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SpeechCapabilities.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SpeechCapabilities.h
deleted file mode 100644
index ce2de5e03..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SpeechCapabilities.h
+++ /dev/null
@@ -1,77 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SPEECHCAPABILITIES_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SPEECHCAPABILITIES_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Contains information about the TTS capabilities.
-
-  class SpeechCapabilities
-  {
-  public:
-    enum SpeechCapabilitiesInternal
-    {
-      INVALID_ENUM=-1,
-      SC_TEXT=0,
-      SAPI_PHONEMES=1,
-      LHPLUS_PHONEMES=2,
-      PRE_RECORDED=3,
-      SILENCE=4
-    };
-  
-    SpeechCapabilities() : mInternal(INVALID_ENUM)				{}
-    SpeechCapabilities(SpeechCapabilitiesInternal e) : mInternal(e)		{}
-  
-    SpeechCapabilitiesInternal get(void) const	{ return mInternal; }
-    void set(SpeechCapabilitiesInternal e)		{ mInternal=e; }
-  
-  private:
-    SpeechCapabilitiesInternal mInternal;
-    friend class SpeechCapabilitiesMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/StartTime.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/StartTime.h
deleted file mode 100644
index 34b36e17f..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/StartTime.h
+++ /dev/null
@@ -1,88 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_STARTTIME_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_STARTTIME_INCLUDE
-
-
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  class StartTime
-  {
-  public:
-  
-    StartTime(const StartTime& c);
-    StartTime(void);
-  
-    bool checkIntegrity(void);
-  // getters
-
-    unsigned int get_hours(void) const;
-    unsigned int get_minutes(void) const;
-    unsigned int get_seconds(void) const;
-
-// setters
-
-    bool set_hours(unsigned int hours_);
-    bool set_minutes(unsigned int minutes_);
-    bool set_seconds(unsigned int seconds_);
-
-  private:
-
-    friend class StartTimeMarshaller;
-
-
-/**
-     The hour of the media clock.
-     Some radios only support a max of 19 hours. If out of range, it will be rejected.
-*/
-      unsigned int hours;	//!<  (0,59)
-      unsigned int minutes;	//!<  (0,59)
-      unsigned int seconds;	//!<  (0,59)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SubscribeButton_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SubscribeButton_request.h
deleted file mode 100644
index 4135977c0..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SubscribeButton_request.h
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SUBSCRIBEBUTTON_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SUBSCRIBEBUTTON_REQUEST_INCLUDE
-
-
-#include "ButtonName.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-/**
-     Subscribes to built-in HMI buttons.
-     The application will be notified by the OnButtonEvent and OnButtonPress.
-     To unsubscribe the notifications, use unsubscribeButton.
-*/
-
-  class SubscribeButton_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    SubscribeButton_request(const SubscribeButton_request& c);
-    SubscribeButton_request(void);
-    
-    virtual ~SubscribeButton_request(void);
-  
-    bool checkIntegrity(void);
-
-    const ButtonName& get_buttonName(void) const;
-
-    bool set_buttonName(const ButtonName& buttonName_);
-
-  private:
-  
-    friend class SubscribeButton_requestMarshaller;
-
-
-///  Name of the button to subscribe.
-      ButtonName buttonName;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SubscribeButton_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SubscribeButton_response.h
deleted file mode 100644
index 9b90948de..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SubscribeButton_response.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SUBSCRIBEBUTTON_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SUBSCRIBEBUTTON_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    class SubscribeButton_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        SubscribeButton_response(const SubscribeButton_response& c);
-        SubscribeButton_response(void);
-
-        virtual ~SubscribeButton_response(void);
-
-        SubscribeButton_response& operator =(const SubscribeButton_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class SubscribeButton_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SubscribeVehicleData_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SubscribeVehicleData_request.h
deleted file mode 100644
index 1f6357440..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SubscribeVehicleData_request.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SUBSCRIBEVEHICLEDATA_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SUBSCRIBEVEHICLEDATA_REQUEST_INCLUDE
-
-#include <vector>
-
-#include "VehicleDataType.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-/**
-     Subscribes for specific published data items.
-     The data will be only sent if it has changed.
-     The application will be notified by the onVehicleData notification whenever new data is available.
-     To unsubscribe the notifications, use unsubscribe with the same subscriptionType.
-*/
-
-  class SubscribeVehicleData_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    SubscribeVehicleData_request(const SubscribeVehicleData_request& c);
-    SubscribeVehicleData_request(void);
-    
-    virtual ~SubscribeVehicleData_request(void);
-  
-    bool checkIntegrity(void);
-
-    const std::vector<VehicleDataType>& get_dataType(void) const;
-
-    bool set_dataType(const std::vector<VehicleDataType>& dataType_);
-
-  private:
-  
-    friend class SubscribeVehicleData_requestMarshaller;
-
-
-/**
-     List of defined vehicle data elements.
-     See VehicleDataType
-*/
-      std::vector<VehicleDataType> dataType;	//!<   [%s..%s] 
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SubscribeVehicleData_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SubscribeVehicleData_response.h
deleted file mode 100644
index 7ed881c86..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SubscribeVehicleData_response.h
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SUBSCRIBEVEHICLEDATA_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SUBSCRIBEVEHICLEDATA_RESPONSE_INCLUDE
-
-#include <vector>
-
-#include "VehicleDataResult.h"
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    class SubscribeVehicleData_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        SubscribeVehicleData_response(const SubscribeVehicleData_response& c);
-        SubscribeVehicleData_response(void);
-
-        virtual ~SubscribeVehicleData_response(void);
-
-        SubscribeVehicleData_response& operator =(const SubscribeVehicleData_response&);
-
-        bool checkIntegrity(void);
-
-        const std::vector<VehicleDataResult>* get_dataResult(void) const;
-        void reset_dataResult(void);
-        bool set_dataResult(const std::vector<VehicleDataResult>& dataResult_);
-
-    private:
-        friend class SubscribeVehicleData_responseMarshaller;
-
-        ///  Permission status of vehicle data element.
-        std::vector<VehicleDataResult>* dataResult;   //!<   [%s..%s]
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SyncMsgVersion.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SyncMsgVersion.h
deleted file mode 100644
index 92b5c8ced..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SyncMsgVersion.h
+++ /dev/null
@@ -1,86 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SYNCMSGVERSION_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SYNCMSGVERSION_INCLUDE
-
-
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Specifies the version number of the SYNC V4 protocol, that is supported by the mobile application
-
-  class SyncMsgVersion
-  {
-  public:
-  
-    SyncMsgVersion(const SyncMsgVersion& c);
-    SyncMsgVersion(void);
-  
-    bool checkIntegrity(void);
-  // getters
-
-    unsigned int get_majorVersion(void) const;
-    unsigned int get_minorVersion(void) const;
-
-// setters
-
-    bool set_majorVersion(unsigned int majorVersion_);
-    bool set_minorVersion(unsigned int minorVersion_);
-
-  private:
-
-    friend class SyncMsgVersionMarshaller;
-
-
-///  The major version indicates versions that is not-compatible to previous versions.
-      unsigned int majorVersion;	//!<  (1,10)
-
-///  The minor version indicates a change to a previous version that should still allow to be run on an older version (with limited functionality)
-      unsigned int minorVersion;	//!<  (0,1000)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SystemAction.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SystemAction.h
deleted file mode 100644
index c5a8aece2..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SystemAction.h
+++ /dev/null
@@ -1,81 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SYSTEMACTION_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SYSTEMACTION_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Enumeration that describes system actions that can be triggered.
-
-  class SystemAction
-  {
-  public:
-    enum SystemActionInternal
-    {
-      INVALID_ENUM=-1,
-
-///  Default action occurs.  Standard behavior (e.g. SoftButton clears overlay).
-      DEFAULT_ACTION=0,
-
-///  App is brought into HMI_FULL.
-      STEAL_FOCUS=1,
-
-///  Current system context is maintained.  An overlay is persisted even though a SoftButton has been pressed and the notification sent.
-      KEEP_CONTEXT=2
-    };
-  
-    SystemAction() : mInternal(INVALID_ENUM)				{}
-    SystemAction(SystemActionInternal e) : mInternal(e)		{}
-  
-    SystemActionInternal get(void) const	{ return mInternal; }
-    void set(SystemActionInternal e)		{ mInternal=e; }
-  
-  private:
-    SystemActionInternal mInternal;
-    friend class SystemActionMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SystemContext.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SystemContext.h
deleted file mode 100644
index 0316dbaba..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/SystemContext.h
+++ /dev/null
@@ -1,92 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_SYSTEMCONTEXT_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_SYSTEMCONTEXT_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-/**
-     Enumeration that describes possible contexts an app's HMI might be in.
-     Communicated to whichever app is in HMI FULL, except Alert.
-*/
-
-  class SystemContext
-  {
-  public:
-    enum SystemContextInternal
-    {
-      INVALID_ENUM=-1,
-
-///  The app's persistent display (whether media/non-media/navigation) is fully visible onscreen.
-      SYSCTXT_MAIN=0,
-
-///  The system is currently in a VR session (with whatever dedicated VR screen being overlaid onscreen).
-      SYSCTXT_VRSESSION=1,
-
-///  The system is currently displaying a system or in-App menu onscreen.
-      SYSCTXT_MENU=2,
-
-///  The app's display HMI is currently being obscured by either a system or other app's overlay.
-      SYSCTXT_HMI_OBSCURED=3,
-
-///  Broadcast only to whichever app has an alert currently being displayed.
-      SYSCTXT_ALERT=4,
-      NOT_AUDIBLE=5,
-      AUDIBLE=6
-    };
-
-    SystemContext() : mInternal(INVALID_ENUM)				{}
-    SystemContext(SystemContextInternal e) : mInternal(e)		{}
-
-    SystemContextInternal get(void) const	{ return mInternal; }
-    void set(SystemContextInternal e)		{ mInternal=e; }
-
-  private:
-    SystemContextInternal mInternal;
-    friend class SystemContextMarshaller;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/TBTState.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/TBTState.h
deleted file mode 100644
index d0127c36b..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/TBTState.h
+++ /dev/null
@@ -1,82 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_TBTSTATE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_TBTSTATE_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Enumeration that describes possible states of turn-by-turn client or SmartDeviceLink app.
-
-  class TBTState
-  {
-  public:
-    enum TBTStateInternal
-    {
-      INVALID_ENUM=-1,
-      ROUTE_UPDATE_REQUEST=0,
-      ROUTE_ACCEPTED=1,
-      ROUTE_REFUSED=2,
-      ROUTE_CANCELLED=3,
-      ETA_REQUEST=4,
-      NEXT_TURN_REQUEST=5,
-      ROUTE_STATUS_REQUEST=6,
-      ROUTE_SUMMARY_REQUEST=7,
-      TRIP_STATUS_REQUEST=8,
-      ROUTE_UPDATE_REQUEST_TIMEOUT=9
-    };
-  
-    TBTState() : mInternal(INVALID_ENUM)				{}
-    TBTState(TBTStateInternal e) : mInternal(e)		{}
-  
-    TBTStateInternal get(void) const	{ return mInternal; }
-    void set(TBTStateInternal e)		{ mInternal=e; }
-  
-  private:
-    TBTStateInternal mInternal;
-    friend class TBTStateMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/TTSChunk.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/TTSChunk.h
deleted file mode 100644
index d07f1ad53..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/TTSChunk.h
+++ /dev/null
@@ -1,91 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_TTSCHUNK_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_TTSCHUNK_INCLUDE
-
-#include <string>
-
-#include "SpeechCapabilities.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  A TTS chunk, that consists of the text/phonemes to speak and the type (like text or SAPI)
-
-  class TTSChunk
-  {
-  public:
-  
-    TTSChunk(const TTSChunk& c);
-    TTSChunk(void);
-  
-    bool checkIntegrity(void);
-  // getters
-
-    const std::string& get_text(void) const;
-    const SpeechCapabilities& get_type(void) const;
-
-// setters
-
-    bool set_text(const std::string& text_);
-    bool set_type(const SpeechCapabilities& type_);
-
-  private:
-
-    friend class TTSChunkMarshaller;
-
-
-/**
-     The text or phonemes to speak.
-     May not be empty.
-*/
-      std::string text;	//!< (500)
-
-///  Describes, whether it is text or a specific phoneme set. See SpeechCapabilities
-      SpeechCapabilities type;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/TextAlignment.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/TextAlignment.h
deleted file mode 100644
index a530de074..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/TextAlignment.h
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_TEXTALIGNMENT_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_TEXTALIGNMENT_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  The list of possible alignments, left, right, or centered
-
-  class TextAlignment
-  {
-  public:
-    enum TextAlignmentInternal
-    {
-      INVALID_ENUM=-1,
-      LEFT_ALIGNED=0,
-      RIGHT_ALIGNED=1,
-      CENTERED=2
-    };
-  
-    TextAlignment() : mInternal(INVALID_ENUM)				{}
-    TextAlignment(TextAlignmentInternal e) : mInternal(e)		{}
-  
-    TextAlignmentInternal get(void) const	{ return mInternal; }
-    void set(TextAlignmentInternal e)		{ mInternal=e; }
-  
-  private:
-    TextAlignmentInternal mInternal;
-    friend class TextAlignmentMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/TextField.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/TextField.h
deleted file mode 100644
index 1c5ce12c6..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/TextField.h
+++ /dev/null
@@ -1,96 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_TEXTFIELD_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_TEXTFIELD_INCLUDE
-
-
-#include "CharacterSet.h"
-#include "TextFieldName.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  class TextField
-  {
-  public:
-  
-    TextField(const TextField& c);
-    TextField(void);
-  
-    bool checkIntegrity(void);
-  // getters
-
-    const CharacterSet& get_characterSet(void) const;
-    const TextFieldName& get_name(void) const;
-    unsigned int get_rows(void) const;
-    unsigned int get_width(void) const;
-
-// setters
-
-    bool set_characterSet(const CharacterSet& characterSet_);
-    bool set_name(const TextFieldName& name_);
-    bool set_rows(unsigned int rows_);
-    bool set_width(unsigned int width_);
-
-  private:
-
-    friend class TextFieldMarshaller;
-
-
-///  The character set that is supported in this field. See CharacterSet.
-      CharacterSet characterSet;
-
-///  The name that identifies the field. See TextFieldName.
-      TextFieldName name;
-
-///  The number of rows of this field.
-      unsigned int rows;	//!<  (1,3)
-
-///  The number of characters in one row of this field.
-      unsigned int width;	//!<  (1,500)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/TextFieldName.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/TextFieldName.h
deleted file mode 100644
index eac2142e3..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/TextFieldName.h
+++ /dev/null
@@ -1,164 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_TEXTFIELDNAME_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_TEXTFIELDNAME_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  class TextFieldName
-  {
-  public:
-    enum TextFieldNameInternal
-    {
-      INVALID_ENUM=-1,
-
-/**
-     The first line of first set of main fields of the persistent display
-     Applies to "Show"
-*/
-      mainField1=0,
-
-/**
-     The second line of first set of main fields of the persistent display
-     Applies to "Show"
-*/
-      mainField2=1,
-
-/**
-     The first line of second set of main fields of persistent display
-     Applies to "Show"
-*/
-      mainField3=2,
-
-/**
-     The second line of second set of main fields of the persistent display
-     Applies to "Show"
-*/
-      mainField4=3,
-
-/**
-     The status bar on Nav
-     Applies to "Show"
-*/
-      statusBar=4,
-
-/**
-     Text value for MediaClock field.
-     Applies to "Show"
-*/
-      mediaClock=5,
-
-/**
-     The track field of NGN type ACMs.
-     This field is only available for media applications.
-     Applies to "Show"
-*/
-      mediaTrack=6,
-
-/**
-     The first line of the alert text field
-     Applies to "Alert"
-*/
-      alertText1=7,
-
-/**
-     The second line of the alert text field
-     Applies to "Alert"
-*/
-      alertText2=8,
-
-/**
-     The third line of the alert text field
-     Applies to "Alert"
-*/
-      alertText3=9,
-
-/**
-      Long form body of text that can include newlines and tabs.
-     Applies to "ScrollableMessage"
-*/
-      scrollableMessageBody=10,
-
-///   First line suggestion for a user response (in the case of VR enabled interaction
-      initialInteractionText=11,
-
-///   First line of navigation text
-      navigationText1=12,
-
-///   Second line of navigation text
-      navigationText2=13,
-
-///   Estimated Time of Arrival time for navigation
-      ETA=14,
-
-///   Total distance to destination for navigation
-      totalDistance=15,
-
-///   First line of text for audio pass thru
-      audioPassThruDisplayText1=16,
-
-///   Second line of text for audio pass thru
-      audioPassThruDisplayText2=17,
-
-///   Header text for slider
-      sliderHeader=18,
-
-///   Footer text for slider
-      sliderFooter=19
-    };
-  
-    TextFieldName() : mInternal(INVALID_ENUM)				{}
-    TextFieldName(TextFieldNameInternal e) : mInternal(e)		{}
-  
-    TextFieldNameInternal get(void) const	{ return mInternal; }
-    void set(TextFieldNameInternal e)		{ mInternal=e; }
-  
-  private:
-    TextFieldNameInternal mInternal;
-    friend class TextFieldNameMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/TimerMode.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/TimerMode.h
deleted file mode 100644
index edfe14190..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/TimerMode.h
+++ /dev/null
@@ -1,79 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_TIMERMODE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_TIMERMODE_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-/**
-     Causes the media clock timer to update from 0:00 to a specified time
-     Causes the media clock timer to update from a specified time to 0:00
-     Indicates to not use the media clock timer
-*/
-
-  class TimerMode
-  {
-  public:
-    enum TimerModeInternal
-    {
-      INVALID_ENUM=-1,
-      UP=0,
-      DOWN=1,
-      NONE=2
-    };
-  
-    TimerMode() : mInternal(INVALID_ENUM)				{}
-    TimerMode(TimerModeInternal e) : mInternal(e)		{}
-  
-    TimerModeInternal get(void) const	{ return mInternal; }
-    void set(TimerModeInternal e)		{ mInternal=e; }
-  
-  private:
-    TimerModeInternal mInternal;
-    friend class TimerModeMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/TirePressureTellTale.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/TirePressureTellTale.h
deleted file mode 100644
index 4a358edd5..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/TirePressureTellTale.h
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_TIREPRESSURETELLTALE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_TIREPRESSURETELLTALE_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Reflects the status of the cluster instrument warning light.
-
-  class TirePressureTellTale
-  {
-  public:
-    enum TirePressureTellTaleInternal
-    {
-      INVALID_ENUM=-1,
-      OFF=0,
-      ON=1,
-      FLASH=2
-    };
-  
-    TirePressureTellTale() : mInternal(INVALID_ENUM)				{}
-    TirePressureTellTale(TirePressureTellTaleInternal e) : mInternal(e)		{}
-  
-    TirePressureTellTaleInternal get(void) const	{ return mInternal; }
-    void set(TirePressureTellTaleInternal e)		{ mInternal=e; }
-  
-  private:
-    TirePressureTellTaleInternal mInternal;
-    friend class TirePressureTellTaleMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/TireStatus.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/TireStatus.h
deleted file mode 100644
index f07dc6f11..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/TireStatus.h
+++ /dev/null
@@ -1,118 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_TIRESTATUS_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_TIRESTATUS_INCLUDE
-
-
-#include "SingleTireStatus.h"
-#include "SingleTireStatus.h"
-#include "SingleTireStatus.h"
-#include "SingleTireStatus.h"
-#include "TirePressureTellTale.h"
-#include "SingleTireStatus.h"
-#include "SingleTireStatus.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  The status and pressure of the tires.
-
-  class TireStatus
-  {
-  public:
-  
-    TireStatus(const TireStatus& c);
-    TireStatus(void);
-  
-    bool checkIntegrity(void);
-  // getters
-
-    const SingleTireStatus& get_innerLeftRear(void) const;
-    const SingleTireStatus& get_innerRightRear(void) const;
-    const SingleTireStatus& get_leftFront(void) const;
-    const SingleTireStatus& get_leftRear(void) const;
-    const TirePressureTellTale& get_pressureTellTale(void) const;
-    const SingleTireStatus& get_rightFront(void) const;
-    const SingleTireStatus& get_rightRear(void) const;
-
-// setters
-
-    bool set_innerLeftRear(const SingleTireStatus& innerLeftRear_);
-    bool set_innerRightRear(const SingleTireStatus& innerRightRear_);
-    bool set_leftFront(const SingleTireStatus& leftFront_);
-    bool set_leftRear(const SingleTireStatus& leftRear_);
-    bool set_pressureTellTale(const TirePressureTellTale& pressureTellTale_);
-    bool set_rightFront(const SingleTireStatus& rightFront_);
-    bool set_rightRear(const SingleTireStatus& rightRear_);
-
-  private:
-
-    friend class TireStatusMarshaller;
-
-
-///  The status of the inner left rear.
-      SingleTireStatus innerLeftRear;
-
-///  The status of the inner right rear.
-      SingleTireStatus innerRightRear;
-
-///  The status of the left front tire.
-      SingleTireStatus leftFront;
-
-///  The status of the left rear tire.
-      SingleTireStatus leftRear;
-
-///  See TirePressureTellTale.
-      TirePressureTellTale pressureTellTale;
-
-///  The status of the right front tire.
-      SingleTireStatus rightFront;
-
-///  The status of the right rear tire.
-      SingleTireStatus rightRear;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/TriggerSource.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/TriggerSource.h
deleted file mode 100644
index 55dfaa9bf..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/TriggerSource.h
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_TRIGGERSOURCE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_TRIGGERSOURCE_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Indicates the source from where the command was triggered.
-
-  class TriggerSource
-  {
-  public:
-    enum TriggerSourceInternal
-    {
-      INVALID_ENUM=-1,
-      TS_MENU=0,
-      TS_VR=1
-    };
-  
-    TriggerSource() : mInternal(INVALID_ENUM)				{}
-    TriggerSource(TriggerSourceInternal e) : mInternal(e)		{}
-  
-    TriggerSourceInternal get(void) const	{ return mInternal; }
-    void set(TriggerSourceInternal e)		{ mInternal=e; }
-  
-  private:
-    TriggerSourceInternal mInternal;
-    friend class TriggerSourceMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Turn.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Turn.h
deleted file mode 100644
index 175989086..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/Turn.h
+++ /dev/null
@@ -1,87 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_TURN_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_TURN_INCLUDE
-
-#include <string>
-
-#include "Image.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  class Turn
-  {
-  public:
-  
-    Turn(const Turn& c);
-    Turn(void);
-  
-    bool checkIntegrity(void);
-  
-    ~Turn(void);
-    Turn& operator =(const Turn&);
-
-// getters
-
-    const std::string* get_navigationText(void) const;
-    const Image& get_turnIcon(void) const;
-
-// setters
-
-    void reset_navigationText(void);
-    bool set_navigationText(const std::string& navigationText_);
-    bool set_turnIcon(const Image& turnIcon_);
-
-  private:
-
-    friend class TurnMarshaller;
-
-      std::string* navigationText;	//!< (500)
-      Image turnIcon;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/UnregisterAppInterface_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/UnregisterAppInterface_request.h
deleted file mode 100644
index e2db1562a..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/UnregisterAppInterface_request.h
+++ /dev/null
@@ -1,79 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_UNREGISTERAPPINTERFACE_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_UNREGISTERAPPINTERFACE_REQUEST_INCLUDE
-
-
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-/**
-     Closes an interface from a mobile application.
-     After unregisterAppInterface, no commands other than registerAppInterface will be accepted/executed.
-     Will fail, if no registerAppInterface was completed successfully before.
-*/
-
-  class UnregisterAppInterface_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    UnregisterAppInterface_request(const UnregisterAppInterface_request& c);
-    UnregisterAppInterface_request(void);
-    
-    virtual ~UnregisterAppInterface_request(void);
-  
-    bool checkIntegrity(void);
-
-
-
-  private:
-  
-    friend class UnregisterAppInterface_requestMarshaller;
-
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/UnregisterAppInterface_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/UnregisterAppInterface_response.h
deleted file mode 100644
index 93bb3b4b7..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/UnregisterAppInterface_response.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_UNREGISTERAPPINTERFACE_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_UNREGISTERAPPINTERFACE_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    class UnregisterAppInterface_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        UnregisterAppInterface_response(const UnregisterAppInterface_response& c);
-        UnregisterAppInterface_response(void);
-
-        virtual ~UnregisterAppInterface_response(void);
-
-        UnregisterAppInterface_response& operator =(const UnregisterAppInterface_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class UnregisterAppInterface_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/UnsubscribeButton_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/UnsubscribeButton_request.h
deleted file mode 100644
index 526d5f4a1..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/UnsubscribeButton_request.h
+++ /dev/null
@@ -1,81 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_UNSUBSCRIBEBUTTON_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_UNSUBSCRIBEBUTTON_REQUEST_INCLUDE
-
-
-#include "ButtonName.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Unsubscribes from built-in HMI buttons.
-
-  class UnsubscribeButton_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    UnsubscribeButton_request(const UnsubscribeButton_request& c);
-    UnsubscribeButton_request(void);
-    
-    virtual ~UnsubscribeButton_request(void);
-  
-    bool checkIntegrity(void);
-
-    const ButtonName& get_buttonName(void) const;
-
-    bool set_buttonName(const ButtonName& buttonName_);
-
-  private:
-  
-    friend class UnsubscribeButton_requestMarshaller;
-
-
-///  Name of the button to unsubscribe.
-      ButtonName buttonName;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/UnsubscribeButton_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/UnsubscribeButton_response.h
deleted file mode 100644
index 77acbd6df..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/UnsubscribeButton_response.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_UNSUBSCRIBEBUTTON_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_UNSUBSCRIBEBUTTON_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    class UnsubscribeButton_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        UnsubscribeButton_response(const UnsubscribeButton_response& c);
-        UnsubscribeButton_response(void);
-
-        virtual ~UnsubscribeButton_response(void);
-
-        UnsubscribeButton_response& operator =(const UnsubscribeButton_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class UnsubscribeButton_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/UnsubscribeVehicleData_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/UnsubscribeVehicleData_request.h
deleted file mode 100644
index 0c015589c..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/UnsubscribeVehicleData_request.h
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_UNSUBSCRIBEVEHICLEDATA_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_UNSUBSCRIBEVEHICLEDATA_REQUEST_INCLUDE
-
-#include <vector>
-
-#include "VehicleDataType.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  This function is used to unsubscribe the notifications from the subscribeVehicleData function.
-
-  class UnsubscribeVehicleData_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    UnsubscribeVehicleData_request(const UnsubscribeVehicleData_request& c);
-    UnsubscribeVehicleData_request(void);
-    
-    virtual ~UnsubscribeVehicleData_request(void);
-  
-    bool checkIntegrity(void);
-
-    const std::vector<VehicleDataType>& get_dataType(void) const;
-
-    bool set_dataType(const std::vector<VehicleDataType>& dataType_);
-
-  private:
-  
-    friend class UnsubscribeVehicleData_requestMarshaller;
-
-
-/**
-     Refers to the vehicle data elements specified by subscribeVehicleData.
-     See VehicleDataType
-*/
-      std::vector<VehicleDataType> dataType;	//!<   [%s..%s] 
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/UnsubscribeVehicleData_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/UnsubscribeVehicleData_response.h
deleted file mode 100644
index e572a03c6..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/UnsubscribeVehicleData_response.h
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_UNSUBSCRIBEVEHICLEDATA_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_UNSUBSCRIBEVEHICLEDATA_RESPONSE_INCLUDE
-
-#include <vector>
-
-#include "VehicleDataResult.h"
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    class UnsubscribeVehicleData_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        UnsubscribeVehicleData_response(const UnsubscribeVehicleData_response& c);
-        UnsubscribeVehicleData_response(void);
-
-        virtual ~UnsubscribeVehicleData_response(void);
-
-        UnsubscribeVehicleData_response& operator =(const UnsubscribeVehicleData_response&);
-
-        bool checkIntegrity(void);
-
-        const std::vector<VehicleDataResult>* get_dataResult(void) const;
-        void reset_dataResult(void);
-        bool set_dataResult(const std::vector<VehicleDataResult>& dataResult_);
-
-    private:
-        friend class UnsubscribeVehicleData_responseMarshaller;
-
-        ///  Permission status of vehicle data element.
-        std::vector<VehicleDataResult>* dataResult;   //!<   [%s..%s]
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/UpdateMode.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/UpdateMode.h
deleted file mode 100644
index 36cff01fd..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/UpdateMode.h
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_UPDATEMODE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_UPDATEMODE_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-/**
-     Describes how the media clock timer should behave on the platform
-     Starts the media clock timer counting upwards, as in time elapsed.
-     Starts the media clock timer counting downwards, as in time remaining.
-     Pauses the media clock timer
-     Resume the media clock timer
-     Clears the media clock timer (previously done through Show->mediaClock)
-*/
-
-  class UpdateMode
-  {
-  public:
-    enum UpdateModeInternal
-    {
-      INVALID_ENUM=-1,
-      COUNTUP=0,
-      COUNTDOWN=1,
-      PAUSE=2,
-      RESUME=3,
-      CLEAR=4
-    };
-  
-    UpdateMode() : mInternal(INVALID_ENUM)				{}
-    UpdateMode(UpdateModeInternal e) : mInternal(e)		{}
-  
-    UpdateModeInternal get(void) const	{ return mInternal; }
-    void set(UpdateModeInternal e)		{ mInternal=e; }
-  
-  private:
-    UpdateModeInternal mInternal;
-    friend class UpdateModeMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/UpdateTurnList_request.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/UpdateTurnList_request.h
deleted file mode 100644
index ee77b9e84..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/UpdateTurnList_request.h
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_UPDATETURNLIST_REQUEST_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_UPDATETURNLIST_REQUEST_INCLUDE
-
-#include <vector>
-
-#include "SoftButton.h"
-#include "Turn.h"
-#include "JSONHandler/SDLRPCMessage.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  class UpdateTurnList_request : public NsSmartDeviceLinkRPC::SDLRPCMessage
-  {
-  public:
-  
-    UpdateTurnList_request(const UpdateTurnList_request& c);
-    UpdateTurnList_request(void);
-    
-    virtual ~UpdateTurnList_request(void);
-  
-    bool checkIntegrity(void);
-
-    const std::vector<Turn>& get_turnList(void) const;
-    const std::vector<SoftButton>& get_softButtons(void) const;
-
-    bool set_turnList(const std::vector<Turn>& turnList_);
-    bool set_softButtons(const std::vector<SoftButton>& softButtons_);
-
-  private:
-  
-    friend class UpdateTurnList_requestMarshaller;
-
-      std::vector<Turn> turnList;	//!<   [%s..%s] 
-
-///  If omitted on supported displays, app-defined SoftButton will be left blank.
-      std::vector<SoftButton> softButtons;	//!<   [%s..%s] 
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/UpdateTurnList_response.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/UpdateTurnList_response.h
deleted file mode 100644
index c4afa90b1..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/UpdateTurnList_response.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_UPDATETURNLIST_RESPONSE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_UPDATETURNLIST_RESPONSE_INCLUDE
-
-#include "JSONHandler/SDLRPCResponse.h"
-
-/*
-  interface Ford Sync RAPI
-  version   2.0O
-  date      2012-11-02
-  generated at  Thu Jan 24 06:36:23 2013
-  source stamp  Thu Jan 24 06:35:41 2013
-  author    RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-    class UpdateTurnList_response : public NsSmartDeviceLinkRPC::SDLRPCResponse
-    {
-    public:
-        UpdateTurnList_response(const UpdateTurnList_response& c);
-        UpdateTurnList_response(void);
-
-        virtual ~UpdateTurnList_response(void);
-
-        UpdateTurnList_response& operator =(const UpdateTurnList_response&);
-
-        bool checkIntegrity(void);
-
-    private:
-        friend class UpdateTurnList_responseMarshaller;
-    };
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/VehicleDataResult.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/VehicleDataResult.h
deleted file mode 100644
index e88e99ae1..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/VehicleDataResult.h
+++ /dev/null
@@ -1,88 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_VEHICLEDATARESULT_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_VEHICLEDATARESULT_INCLUDE
-
-
-#include "VehicleDataType.h"
-#include "VehicleDataResultCode.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Individual published data request result
-
-  class VehicleDataResult
-  {
-  public:
-  
-    VehicleDataResult(const VehicleDataResult& c);
-    VehicleDataResult(void);
-  
-    bool checkIntegrity(void);
-  // getters
-
-    const VehicleDataType& get_dataType(void) const;
-    const VehicleDataResultCode& get_resultCode(void) const;
-
-// setters
-
-    bool set_dataType(const VehicleDataType& dataType_);
-    bool set_resultCode(const VehicleDataResultCode& resultCode_);
-
-  private:
-
-    friend class VehicleDataResultMarshaller;
-
-
-///  Defined published data element type.
-      VehicleDataType dataType;
-
-///  Published data result code.
-      VehicleDataResultCode resultCode;
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/VehicleDataResultCode.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/VehicleDataResultCode.h
deleted file mode 100644
index d07a6abd0..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/VehicleDataResultCode.h
+++ /dev/null
@@ -1,80 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_VEHICLEDATARESULTCODE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_VEHICLEDATARESULTCODE_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Enumeration that describes possible result codes of a vehicle data entry request.
-
-  class VehicleDataResultCode
-  {
-  public:
-    enum VehicleDataResultCodeInternal
-    {
-      INVALID_ENUM=-1,
-      VDRC_SUCCESS=0,
-      VDRC_DISALLOWED=1,
-      VDRC_USER_DISALLOWED=2,
-      VDRC_INVALID_ID=3,
-      VDRC_DATA_NOT_AVAILABLE=4,
-      VDRC_DATA_ALREADY_SUBSCRIBED=5,
-      VDRC_DATA_NOT_SUBSCRIBED=6,
-      VDRC_IGNORED=7
-    };
-  
-    VehicleDataResultCode() : mInternal(INVALID_ENUM)				{}
-    VehicleDataResultCode(VehicleDataResultCodeInternal e) : mInternal(e)		{}
-  
-    VehicleDataResultCodeInternal get(void) const	{ return mInternal; }
-    void set(VehicleDataResultCodeInternal e)		{ mInternal=e; }
-  
-  private:
-    VehicleDataResultCodeInternal mInternal;
-    friend class VehicleDataResultCodeMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/VehicleDataType.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/VehicleDataType.h
deleted file mode 100644
index f99d291c4..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/VehicleDataType.h
+++ /dev/null
@@ -1,101 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_VEHICLEDATATYPE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_VEHICLEDATATYPE_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Defines the data types that can be published and subscribed to.
-
-  class VehicleDataType
-  {
-  public:
-    enum VehicleDataTypeInternal
-    {
-      INVALID_ENUM=-1,
-
-/**
-     Notifies GPSData
-     may be subscribed
-*/
-      VEHICLEDATA_GPS=0,
-      VEHICLEDATA_SPEED=1,
-      VEHICLEDATA_FUELLEVEL=2,
-      VEHICLEDATA_FUELECONOMY=3,
-      VEHICLEDATA_ENGINERPM=4,
-      VEHICLEDATA_BATTVOLTS=5,
-      VEHICLEDATA_RAINSENSOR=6,
-      VEHICLEDATA_ODOMETER=7,
-      VEHICLEDATA_VIN=8,
-      VEHICLEDATA_EXTERNTEMP=9,
-      VEHICLEDATA_PRNDLSTATUS=10,
-      VEHICLEDATA_TIREPRESSURE=11,
-
-///  Battery pack voltage of hybrid and electrical vehicles
-      VEHICLEDATA_BATTERYPACKVOLTAGE=12,
-
-///  Battery current of hybrid and electrical vehicles
-      VEHICLEDATA_BATTERYCURRENT=13,
-
-///  Battery temperature of hybrid and electrical vehicles
-      VEHICLEDATA_BATTERYTEMPERATURE=14,
-
-///  Satellite radio serial number (ESN)
-      VEHICLEDATA_SATESN=15
-    };
-  
-    VehicleDataType() : mInternal(INVALID_ENUM)				{}
-    VehicleDataType(VehicleDataTypeInternal e) : mInternal(e)		{}
-  
-    VehicleDataTypeInternal get(void) const	{ return mInternal; }
-    void set(VehicleDataTypeInternal e)		{ mInternal=e; }
-  
-  private:
-    VehicleDataTypeInternal mInternal;
-    friend class VehicleDataTypeMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/VehicleType.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/VehicleType.h
deleted file mode 100644
index 56f133ff4..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/VehicleType.h
+++ /dev/null
@@ -1,115 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_VEHICLETYPE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_VEHICLETYPE_INCLUDE
-
-#include <string>
-
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  class VehicleType
-  {
-  public:
-  
-    VehicleType(const VehicleType& c);
-    VehicleType(void);
-  
-    bool checkIntegrity(void);
-  
-    ~VehicleType(void);
-    VehicleType& operator =(const VehicleType&);
-
-// getters
-
-    const std::string* get_make(void) const;
-    const std::string* get_model(void) const;
-    const std::string* get_modelYear(void) const;
-    const std::string* get_trim(void) const;
-
-// setters
-
-    void reset_make(void);
-    bool set_make(const std::string& make_);
-    void reset_model(void);
-    bool set_model(const std::string& model_);
-    void reset_modelYear(void);
-    bool set_modelYear(const std::string& modelYear_);
-    void reset_trim(void);
-    bool set_trim(const std::string& trim_);
-
-  private:
-
-    friend class VehicleTypeMarshaller;
-
-
-/**
-     Make of the vehicle
-     e.g. Ford
-*/
-      std::string* make;	//!< (500)
-
-/**
-     Model of the vehicle
-     e.g. Fiesta
-*/
-      std::string* model;	//!< (500)
-
-/**
-     Model Year of the vehicle
-     e.g. 2013
-*/
-      std::string* modelYear;	//!< (500)
-
-/**
-     Trim of the vehicle
-     e.g. SE
-*/
-      std::string* trim;	//!< (500)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/VrCapabilities.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/VrCapabilities.h
deleted file mode 100644
index 9d4b9bc8a..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/VrCapabilities.h
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_VRCAPABILITIES_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_VRCAPABILITIES_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-///  Contains information about the VR capabilities.
-
-  class VrCapabilities
-  {
-  public:
-    enum VrCapabilitiesInternal
-    {
-      INVALID_ENUM=-1,
-      VR_TEXT=0
-    };
-  
-    VrCapabilities() : mInternal(INVALID_ENUM)				{}
-    VrCapabilities(VrCapabilitiesInternal e) : mInternal(e)		{}
-  
-    VrCapabilitiesInternal get(void) const	{ return mInternal; }
-    void set(VrCapabilitiesInternal e)		{ mInternal=e; }
-  
-  private:
-    VrCapabilitiesInternal mInternal;
-    friend class VrCapabilitiesMarshaller;
-  };
-  
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/VrHelpItem.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/VrHelpItem.h
deleted file mode 100644
index 8050e5289..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/VrHelpItem.h
+++ /dev/null
@@ -1,91 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_VRHELPITEM_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_VRHELPITEM_INCLUDE
-
-#include <string>
-
-#include "Image.h"
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-  class VrHelpItem
-  {
-  public:
-  
-    VrHelpItem(const VrHelpItem& c);
-    VrHelpItem(void);
-  
-    bool checkIntegrity(void);
-  // getters
-
-    const Image& get_image(void) const;
-    unsigned int get_position(void) const;
-    const std::string& get_text(void) const;
-
-// setters
-
-    bool set_image(const Image& image_);
-    bool set_position(unsigned int position_);
-    bool set_text(const std::string& text_);
-
-  private:
-
-    friend class VrHelpItemMarshaller;
-
-
-///  Image struct for VR Help item
-      Image image;
-
-///  Position to display item in VR Help list
-      unsigned int position;	//!<  (1,8)
-
-///  Text to display for VR Help item
-      std::string text;	//!< (500)
-  };
-
-}
-
-#endif
diff --git a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/messageType.h b/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/messageType.h
deleted file mode 100644
index 0cdc7c6ef..000000000
--- a/SDL_Core/src/components/JSONHandler/include/JSONHandler/SDLRPCObjects/V2/messageType.h
+++ /dev/null
@@ -1,78 +0,0 @@
-//
-// Copyright (c) 2013, Ford Motor Company
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided with the
-// distribution.
-//
-// Neither the name of the Ford Motor Company nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-
-#ifndef NSSMARTDEVICELINKKRPCV2_MESSAGETYPE_INCLUDE
-#define NSSMARTDEVICELINKKRPCV2_MESSAGETYPE_INCLUDE
-
-
-/*
-  interface	Ford Sync RAPI
-  version	2.0O
-  date		2012-11-02
-  generated at	Thu Jan 24 06:36:23 2013
-  source stamp	Thu Jan 24 06:35:41 2013
-  author	RC
-*/
-
-namespace NsSmartDeviceLinkRPCV2
-{
-
-/**
-     Enumeration linking message types with function types in WiPro protocol.
-     Assumes enumeration starts at value 0.
-*/
-
-  class messageType
-  {
-  public:
-    enum messageTypeInternal
-    {
-      INVALID_ENUM=-1,
-      request=0,
-      response=1,
-      notification=2
-    };
-  
-    messageType() : mInternal(INVALID_ENUM)				{}
-    messageType(messageTypeInternal e) : mInternal(e)		{}
-  
-    messageTypeInternal get(void) const	{ return mInternal; }
-    void set(messageTypeInternal e)		{ mInternal=e; }
-  
-  private:
-    messageTypeInternal mInternal;
-    friend class messageTypeMarshaller;
-  };
-  
-}
-
-#endif