--- a/OrthancServer/main.cpp	Fri Oct 25 11:50:17 2013 +0200
+++ b/OrthancServer/main.cpp	Fri Oct 25 11:57:30 2013 +0200
@@ -45,6 +45,7 @@
 #include "OrthancInitialization.h"
 #include "ServerContext.h"
 #include "OrthancFindRequestHandler.h"
+#include "OrthancMoveRequestHandler.h"
 
 using namespace Orthanc;
 
@@ -75,154 +76,6 @@
 
 
 
-class OrthancMoveRequestIterator : public IMoveRequestIterator
-{
-private:
-  ServerContext& context_;
-  std::vector<std::string> instances_;
-  DicomUserConnection connection_;
-  size_t position_;
-
-public:
-  OrthancMoveRequestIterator(ServerContext& context,
-                             const std::string& target,
-                             const std::string& publicId) :
-    context_(context),
-    position_(0)
-  {
-    LOG(INFO) << "Sending resource " << publicId << " to modality \"" << target << "\"";
-
-    std::list<std::string> tmp;
-    context_.GetIndex().GetChildInstances(tmp, publicId);
-
-    instances_.reserve(tmp.size());
-    for (std::list<std::string>::iterator it = tmp.begin(); it != tmp.end(); it++)
-    {
-      instances_.push_back(*it);
-    }
-    
-    ConnectToModalityUsingAETitle(connection_, target);
-  }
-
-  virtual unsigned int GetSubOperationCount() const
-  {
-    return instances_.size();
-  }
-
-  virtual Status DoNext()
-  {
-    if (position_ >= instances_.size())
-    {
-      return Status_Failure;
-    }
-
-    const std::string& id = instances_[position_++];
-
-    std::string dicom;
-    context_.ReadFile(dicom, id, FileContentType_Dicom);
-    connection_.Store(dicom);
-
-    return Status_Success;
-  }
-};
-
-
-
-class OrthancMoveRequestHandler : public IMoveRequestHandler
-{
-private:
-  ServerContext& context_;
-
-  bool LookupResource(std::string& publicId,
-                      DicomTag tag,
-                      const DicomMap& input)
-  {
-    if (!input.HasTag(tag))
-    {
-      return false;
-    }
-
-    std::string value = input.GetValue(tag).AsString();
-
-    std::list<std::string> ids;
-    context_.GetIndex().LookupTagValue(ids, tag, value);
-
-    if (ids.size() != 1)
-    {
-      return false;
-    }
-    else
-    {
-      publicId = ids.front();
-      return true;
-    }
-  }
-
-public:
-  OrthancMoveRequestHandler(ServerContext& context) :
-    context_(context)
-  {
-  }
-
-public:
-  virtual IMoveRequestIterator* Handle(const std::string& target,
-                                       const DicomMap& input)
-  {
-    LOG(WARNING) << "Move-SCU request received for AET \"" << target << "\"";
-
-
-    /**
-     * Retrieve the query level.
-     **/
-
-    const DicomValue* levelTmp = input.TestAndGetValue(DICOM_TAG_QUERY_RETRIEVE_LEVEL);
-    if (levelTmp == NULL) 
-    {
-      throw OrthancException(ErrorCode_BadRequest);
-    }
-
-    ResourceType level = StringToResourceType(levelTmp->AsString().c_str());
-
-
-    /**
-     * Lookup for the resource to be sent.
-     **/
-
-    bool ok;
-    std::string publicId;
-
-    switch (level)
-    {
-      case ResourceType_Patient:
-        ok = LookupResource(publicId, DICOM_TAG_PATIENT_ID, input);
-        break;
-
-      case ResourceType_Study:
-        ok = LookupResource(publicId, DICOM_TAG_STUDY_INSTANCE_UID, input);
-        break;
-
-      case ResourceType_Series:
-        ok = LookupResource(publicId, DICOM_TAG_SERIES_INSTANCE_UID, input);
-        break;
-
-      case ResourceType_Instance:
-        ok = LookupResource(publicId, DICOM_TAG_SOP_INSTANCE_UID, input);
-        break;
-
-      default:
-        ok = false;
-    }
-
-    if (!ok)
-    {
-      throw OrthancException(ErrorCode_BadRequest);
-    }
-
-    return new OrthancMoveRequestIterator(context_, target, publicId);
-  }
-};
-
-
 class MyDicomServerFactory : 
   public IStoreRequestHandlerFactory,
   public IFindRequestHandlerFactory,