Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/function/ComputeConcordance.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/function/ComputeConcordance.java	(revision 370)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/function/ComputeConcordance.java	(revision 371)
@@ -1,255 +0,0 @@
-// Copyright © 2010-2013 ENS de Lyon.
-// Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of
-// Lyon 2, University of Franche-Comté, University of Nice
-// Sophia Antipolis, University of Paris 3.
-// 
-// The TXM platform is free software: you can redistribute it
-// and/or modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation,
-// either version 2 of the License, or (at your option) any
-// later version.
-// 
-// The TXM platform is distributed in the hope that it will be
-// useful, but WITHOUT ANY WARRANTY; without even the implied
-// warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-// PURPOSE. See the GNU General Public License for more
-// details.
-// 
-// You should have received a copy of the GNU General
-// Public License along with the TXM platform. If not, see
-// http://www.gnu.org/licenses.
-// 
-// 
-// 
-// $LastChangedDate:$
-// $LastChangedRevision:$
-// $LastChangedBy:$ 
-//
-package org.txm.rcp.commands.function;
-
-import javax.inject.Inject;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective;
-import org.eclipse.e4.ui.model.application.ui.advanced.impl.PerspectiveStackImpl;
-import org.eclipse.e4.ui.model.application.ui.advanced.impl.PlaceholderImpl;
-import org.eclipse.e4.ui.model.application.ui.basic.MPart;
-import org.eclipse.e4.ui.model.application.ui.basic.MPartSashContainerElement;
-import org.eclipse.e4.ui.model.application.ui.basic.MStackElement;
-import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
-import org.eclipse.e4.ui.model.application.ui.basic.MWindowElement;
-import org.eclipse.e4.ui.model.application.ui.basic.impl.PartSashContainerImpl;
-import org.eclipse.e4.ui.model.application.ui.basic.impl.PartStackImpl;
-import org.eclipse.e4.ui.workbench.modeling.EModelService;
-import org.eclipse.e4.ui.workbench.modeling.EPartService;
-import org.eclipse.e4.ui.workbench.modeling.EPlaceholderResolver;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorReference;
-import org.eclipse.ui.IPageLayout;
-import org.eclipse.ui.IPartService;
-import org.eclipse.ui.IPerspectiveDescriptor;
-import org.eclipse.ui.ISaveablePart;
-import org.eclipse.ui.IViewReference;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkingSet;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.handlers.HandlerUtil;
-import org.eclipse.ui.internal.EditorReference;
-import org.eclipse.ui.internal.PartService;
-import org.eclipse.ui.internal.Workbench;
-import org.eclipse.ui.internal.WorkbenchPage;
-import org.eclipse.ui.internal.WorkbenchWindow;
-import org.eclipse.ui.internal.WorkingSet;
-import org.eclipse.ui.internal.registry.PerspectiveDescriptor;
-import org.txm.Toolbox;
-import org.txm.rcp.Messages;
-import org.txm.rcp.StatusLine;
-import org.txm.rcp.TXMWindows;
-import org.txm.rcp.editors.concordances.ConcordancesEditor;
-import org.txm.rcp.editors.input.ConcordancesEditorInput;
-import org.txm.searchengine.cqp.corpus.Corpus;
-
-import cern.colt.Arrays;
-
-// TODO: Auto-generated Javadoc
-/**
- * Open the concordance editor @ author mdecorde.
- */
-public class ComputeConcordance extends AbstractHandler {
-
-	/** The selection. */
-	private IStructuredSelection selection;
-
-	/** The editor input. */
-	private ConcordancesEditorInput editorInput;
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
-	 */
-	@Override
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		
-		ISelection sel = (IStructuredSelection) HandlerUtil.getCurrentSelection(event);
-		if (!(sel instanceof IStructuredSelection)) return null;
-		selection = (IStructuredSelection) sel;
-
-		Object s = selection.getFirstElement();
-		if (!(s instanceof Corpus))
-			return null;
-		Corpus corpus = (Corpus) s;
-		if (openEditor(corpus)) {
-
-		} else {
-			System.out.println(Messages.ComputeConcordance_1);
-		}
-
-		return null;
-	}
-
-	@Inject
-	public static boolean openEditor(Corpus corpus) {
-		if (!Toolbox.isSearchEngineInitialized()) return false;
-		ConcordancesEditorInput editorInput = new ConcordancesEditorInput(corpus, null);
-
-		// MD: test of manipulating the editor's position in the UI
-		/*
-		Workbench wb = (Workbench) PlatformUI.getWorkbench();
-
-		System.out.println("Workbench: " + wb);
-		for (IWorkbenchWindow iwindow : wb.getWorkbenchWindows()) {
-			WorkbenchWindow window = (WorkbenchWindow) iwindow;
-
-			System.out.println(" Window: "+window);
-			for (IWorkbenchPage ipage :window.getPages()) {
-				WorkbenchPage page = (WorkbenchPage)ipage;
-				System.out.println("  Page: "+page);
-				
-				for (IEditorReference ieditor : page.getInternalEditorReferences()) {
-					EditorReference editor = (EditorReference)ieditor;
-					System.out.println("   Editor: "+editor+" "+editor.getId());
-					System.out.println("    part: "+ieditor.getPart(false));
-				}
-				for (IEditorPart dirtyEditor : page.getDirtyEditors()) {
-					System.out.println("   IEditorPart: "+dirtyEditor);
-				}
-
-				for (ISaveablePart dirtyPart : page.getDirtyParts()) {
-					System.out.println("   ISaveablePart: "+dirtyPart);
-				}
-
-				for (EditorReference editorref : page.getInternalEditorReferences()) {
-					System.out.println("   EditorReference: "+editorref+" "+editorref.getId());
-				}
-				//				for (IViewReference viewref : page.getViewReferences()) {
-				//					System.out.println("   IViewReference: "+viewref+" "+viewref.getId());
-				//				}
-				for (IWorkingSet iworkingset : page.getWorkingSets()) {
-					WorkingSet workingset = (WorkingSet)iworkingset;
-					System.out.println("   WorkingSet: "+workingset+" "+workingset.getId());
-					for (IAdaptable a : workingset.getElements()) {
-						System.out.println("    IAdaptable: "+a);
-					}
-				}
-
-				MWindow modelwindow = window.getModel();
-				
-				System.out.println("MWindow: "+modelwindow);
-				for (MWindowElement elem : modelwindow.getChildren()) {
-					if (elem instanceof PartSashContainerImpl) {
-						printChildren(elem, " ");
-//						PartSashContainerImpl psc = (PartSashContainerImpl)elem;
-//						System.out.println(" PartSashContainerImpl: "+psc);
-//						for (MPartSashContainerElement elem2 : psc.getChildren()) {
-//
-//							if (elem2 instanceof PerspectiveStackImpl) {
-//								PerspectiveStackImpl psi = (PerspectiveStackImpl)elem2;
-//								System.out.println("  PerspectiveStackImpl: "+psi);
-//								for (MPerspective p : psi.getChildren()) {
-//									System.out.println("   MPerspective: "+p);
-//									for (MPartSashContainerElement elem3 : p.getChildren()) {
-//										if (elem3 instanceof PartSashContainerImpl) {
-//											PartSashContainerImpl psci = (PartSashContainerImpl)elem3;
-//											printChildren(psci, "    ");
-//										} else {
-//											System.out.println("    MPartSashContainerElement: "+elem3);
-//										}
-//									}
-//								}
-//							} else if (elem2 instanceof PartStackImpl) {
-//								PartStackImpl psi = (PartStackImpl)elem2;
-//								System.out.println("  PartStackImpl: "+psi);
-//								for (MStackElement e : psi.getChildren()) {
-//									System.out.println("   MStackElement: "+e);
-//								}
-//							} else {
-//								System.out.println("  MPartSashContainerElement: "+elem2+" id="+elem2.getElementId());
-//							}
-//						}
-					} else {
-						System.out.println(" MWindowElement: "+elem);
-					}
-				}
-			}
-		}
-	*/
-		try {
-			StatusLine.setMessage(Messages.ComputeConcordance_0);
-			IEditorPart editor = TXMWindows.getActiveWindow().getActivePage()
-					.openEditor(editorInput, "org.txm.rcp.editors.ConcordancesEditor"); //$NON-NLS-1$
-			
-//			WorkbenchWindow window = (WorkbenchWindow)TXMWindows.getActiveWindow();
-//			MWindow model = window.getModel();
-//			EModelService modelService = model.getContext().get(EModelService.class);
-//			EPartService partService = model.getContext().get(EPartService.class);
-//			modelService.find("org.eclipse.ui.editorss", model); // find org.eclipse.ui.editorss?					
-//			MPart part = partService.createPart("org.txm.rcp.editors.ConcordancesEditor");
-//// NEXT STEPS : find partStack, add the part, show the part http://stackoverflow.com/questions/26912078/open-an-editing-partas-an-editor-in-previous-eclipse-versions-in-eclipse-rcp-4
-// ? direct access to PlaceholderImpl : elementId=org.eclipse.ui.editorss	
-			if (editor == null) return false;
-			
-		} catch (PartInitException e) {
-			System.err.println(NLS.bind(Messages.GetConcordances_4, e));
-		}
-		return true;
-	}
-
-	@SuppressWarnings("unused")
-	private static void printChildren(Object o, String space) {
-
-		System.out.println(space+o.getClass().getSimpleName()+": "+o);
-		
-		if (o instanceof PlaceholderImpl) {
-			PlaceholderImpl phi = (PlaceholderImpl)o;
-			System.out.println("phi: "+phi);
-		} else if (o instanceof PartSashContainerImpl) {
-			PartSashContainerImpl psci = (PartSashContainerImpl)o;
-			for (MPartSashContainerElement e :psci.getChildren()) {
-				printChildren(e, space+" ");
-			}
-		} else if (o instanceof PerspectiveStackImpl) {
-			PerspectiveStackImpl psi = (PerspectiveStackImpl)o;
-			for (MPerspective p : psi.getChildren()) {
-				printChildren(p,space+" ");
-			}
-		} else if (o instanceof MPerspective) {
-			MPerspective p = (MPerspective)o;
-			for (MPartSashContainerElement e : p.getChildren()) {
-				printChildren(e, space+" ");
-			}
-		} else if (o instanceof PartStackImpl) {
-			PartStackImpl psi = (PartStackImpl)o;
-			for (MStackElement e : psi.getChildren()) {
-				printChildren(e, space+" ");
-			}
-		}
-	}
-}
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/function/ExportResult.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/function/ExportResult.java	(revision 370)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/function/ExportResult.java	(revision 371)
@@ -44,7 +44,7 @@
 import org.eclipse.ui.handlers.HandlerUtil;
 import org.txm.ca.core.functions.CA;
 import org.txm.cah.core.functions.CAH;
-import org.txm.concordances.functions.Concordance;
+import org.txm.concordance.core.functions.Concordance;
 import org.txm.cooccurrence.core.functions.Cooccurrence;
 import org.txm.core.preferences.TBXPreferences;
 import org.txm.core.preferences.TXMPreferences;
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/krview/Delete.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/krview/Delete.java	(revision 370)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/krview/Delete.java	(revision 371)
@@ -47,7 +47,7 @@
 import org.txm.annotation.repository.LocalKnowledgeRepository;
 import org.txm.annotation.repository.SQLKnowledgeRepository;
 import org.txm.annotation.repository.TypedValue;
-import org.txm.concordances.functions.Line;
+import org.txm.concordance.core.functions.Line;
 import org.txm.rcp.Messages;
 import org.txm.rcp.utils.JobHandler;
 import org.txm.rcp.views.fileexplorer.Explorer;
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/editor/DeleteLines.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/editor/DeleteLines.java	(revision 370)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/editor/DeleteLines.java	(revision 371)
@@ -1,92 +0,0 @@
-// Copyright © 2010-2013 ENS de Lyon.
-// Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of
-// Lyon 2, University of Franche-Comté, University of Nice
-// Sophia Antipolis, University of Paris 3.
-// 
-// The TXM platform is free software: you can redistribute it
-// and/or modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation,
-// either version 2 of the License, or (at your option) any
-// later version.
-// 
-// The TXM platform is distributed in the hope that it will be
-// useful, but WITHOUT ANY WARRANTY; without even the implied
-// warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-// PURPOSE. See the GNU General Public License for more
-// details.
-// 
-// You should have received a copy of the GNU General
-// Public License along with the TXM platform. If not, see
-// http://www.gnu.org/licenses.
-// 
-// 
-// 
-// $LastChangedDate:$
-// $LastChangedRevision:$
-// $LastChangedBy:$ 
-//
-package org.txm.rcp.commands.editor;
-
-import java.util.List;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.handlers.HandlerUtil;
-import org.txm.concordances.functions.Concordance;
-import org.txm.concordances.functions.Line;
-import org.txm.rcp.editors.concordances.ConcordancesEditor;
-
-/**
- * Allow the user to delete lines in a Concordance table.
- * @author mdecorde
- * @author sjacquot
- */
-public class DeleteLines extends AbstractHandler {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
-	 */
-	@Override
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		Shell shell = HandlerUtil.getActiveWorkbenchWindowChecked(event)
-				.getShell();
-		// ISelection selection =
-		// HandlerUtil.getActiveWorkbenchWindow(event).getActivePage().getSelection();
-
-		IWorkbenchPart editor = HandlerUtil.getActiveWorkbenchWindow(event)
-				.getActivePage().getActivePart();
-		if (editor instanceof ConcordancesEditor) {
-			ConcordancesEditor ceditor = (ConcordancesEditor) editor;
-			deleteConcordanceLines(ceditor);
-		}
-
-		return null;
-	}
-
-
-	public static void deleteConcordanceLines(ConcordancesEditor editor) {
-		TableViewer viewer = editor.getLineTableViewer();
-		Concordance concordance = editor.getConcordance();
-		if (concordance == null) return;
-		IStructuredSelection sel = (IStructuredSelection) viewer.getSelection();
-		@SuppressWarnings("unchecked")
-		List<Line> lines = sel.toList();
-
-		if (lines.size() == 0) return;
-
-		try {
-		//	System.out.println("Delete line "+lines);
-			if (concordance.removeLines(lines)) {
-				editor.fillDisplayArea(editor.getTopLine(), editor.getBottomLine()-lines.size());
-			}
-		} catch (Exception e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		}
-	}
-}
