New model for RemoteAccessVpn and moving into the new structure