GNOME.org
 

[longomatch] Insert Core in the LongoMatch namespace

commit 3c2f83e30919fa15cbddf78a7c40e1def9175c86
Author: Andoni Morales Alastruey <ylatuya gmail com>
Date:   Thu Sep 4 21:53:40 2014 +0200

    Insert Core in the LongoMatch namespace

 LongoMatch.Addins/AddinsManager.cs                 |   15 ++++++---------
 .../ExtensionPoints/IConfigModifier.cs             |    2 +-
 .../ExtensionPoints/IExportProject.cs              |    4 ++--
 .../ExtensionPoints/IImportProject.cs              |    4 ++--
 .../ExtensionPoints/IMultimediaBackend.cs          |    2 +-
 LongoMatch.Core/Common/Area.cs                     |    3 +--
 LongoMatch.Core/Common/CaptureSettings.cs          |    2 +-
 LongoMatch.Core/Common/Cloner.cs                   |    4 +---
 LongoMatch.Core/Common/Color.cs                    |    2 +-
 LongoMatch.Core/Common/ConsoleCrayon.cs            |    2 +-
 LongoMatch.Core/Common/Constants.cs                |    2 +-
 LongoMatch.Core/Common/Device.cs                   |    2 +-
 LongoMatch.Core/Common/EncodingProfiles.cs         |    2 +-
 LongoMatch.Core/Common/EncodingQuality.cs          |    2 +-
 LongoMatch.Core/Common/EncodingSettings.cs         |    2 +-
 LongoMatch.Core/Common/Enums.cs                    |    2 +-
 LongoMatch.Core/Common/EventsBroker.cs             |   12 ++++++------
 LongoMatch.Core/Common/Exceptions.cs               |    2 +-
 LongoMatch.Core/Common/ExtensionMethods.cs         |    2 +-
 LongoMatch.Core/Common/Gettext.cs                  |    2 +-
 LongoMatch.Core/Common/Image.cs                    |    2 +-
 LongoMatch.Core/Common/Job.cs                      |    8 ++++----
 LongoMatch.Core/Common/Log.cs                      |    2 +-
 LongoMatch.Core/Common/PlaysFilter.cs              |    6 +++---
 LongoMatch.Core/Common/Serializer.cs               |    8 ++++----
 LongoMatch.Core/Common/SysInfo.cs                  |    2 +-
 LongoMatch.Core/Common/VideoStandards.cs           |    2 +-
 LongoMatch.Core/Config.cs                          |   10 +++++-----
 LongoMatch.Core/Handlers/Drawing.cs                |    6 +++---
 LongoMatch.Core/Handlers/Handlers.cs               |   16 ++++++++--------
 LongoMatch.Core/Handlers/Multimedia.cs             |    6 +++---
 LongoMatch.Core/Interfaces/Drawing/ICanvas.cs      |   10 +++++-----
 LongoMatch.Core/Interfaces/Drawing/IDrawable.cs    |    6 +++---
 .../Interfaces/Drawing/IDrawingToolkit.cs          |    4 ++--
 LongoMatch.Core/Interfaces/Drawing/IWidget.cs      |    6 +++---
 LongoMatch.Core/Interfaces/GUI/IAnalysisWindow.cs  |   10 +++++-----
 LongoMatch.Core/Interfaces/GUI/IBusyDialog.cs      |    2 +-
 LongoMatch.Core/Interfaces/GUI/ICapturerBin.cs     |    8 ++++----
 LongoMatch.Core/Interfaces/GUI/IGUIToolkit.cs      |   16 ++++++++--------
 LongoMatch.Core/Interfaces/GUI/IMainController.cs  |    6 +++---
 LongoMatch.Core/Interfaces/GUI/IPanel.cs           |    4 ++--
 LongoMatch.Core/Interfaces/GUI/IPlayerBin.cs       |   10 +++++-----
 .../Interfaces/GUI/IRenderingStateBar.cs           |    2 +-
 LongoMatch.Core/Interfaces/IDataBaseManager.cs     |    2 +-
 LongoMatch.Core/Interfaces/IDatabase.cs            |    4 ++--
 LongoMatch.Core/Interfaces/IIDObject.cs            |    2 +-
 LongoMatch.Core/Interfaces/IPlaylistElement.cs     |    4 ++--
 LongoMatch.Core/Interfaces/IProjectsImporter.cs    |    4 ++--
 .../Interfaces/IRenderingJobsManager.cs            |    4 ++--
 LongoMatch.Core/Interfaces/ITemplates.cs           |    6 +++---
 LongoMatch.Core/Interfaces/ITemplatesService.cs    |    6 +++---
 LongoMatch.Core/Interfaces/Multimedia/ICapturer.cs |   10 +++++-----
 .../Interfaces/Multimedia/IDiscoverer.cs           |    4 ++--
 .../Interfaces/Multimedia/IFramesCapturer.cs       |    6 +++---
 .../Interfaces/Multimedia/IMultimediaToolkit.cs    |    6 +++---
 LongoMatch.Core/Interfaces/Multimedia/IPlayer.cs   |    8 ++++----
 LongoMatch.Core/Interfaces/Multimedia/IRemuxer.cs  |    4 ++--
 .../Interfaces/Multimedia/IVideoConverter.cs       |    6 +++---
 .../Interfaces/Multimedia/IVideoEditor.cs          |    6 +++---
 LongoMatch.Core/Makefile.am                        |    2 +-
 LongoMatch.Core/Stats/CategoryStats.cs             |    8 ++++----
 LongoMatch.Core/Stats/PercentualStat.cs            |    2 +-
 LongoMatch.Core/Stats/PlayersStats.cs              |    4 ++--
 LongoMatch.Core/Stats/ProjectStats.cs              |   10 +++++-----
 LongoMatch.Core/Stats/Stat.cs                      |    2 +-
 LongoMatch.Core/Stats/SubCategoryStat.cs           |    8 ++++----
 LongoMatch.Core/Store/Coordinates.cs               |    2 +-
 LongoMatch.Core/Store/DashboardButton.cs           |    4 ++--
 LongoMatch.Core/Store/Drawables/Angle.cs           |    4 ++--
 LongoMatch.Core/Store/Drawables/Counter.cs         |    4 ++--
 LongoMatch.Core/Store/Drawables/Cross.cs           |    4 ++--
 LongoMatch.Core/Store/Drawables/Drawable.cs        |    6 +++---
 LongoMatch.Core/Store/Drawables/Ellipse.cs         |    4 ++--
 LongoMatch.Core/Store/Drawables/Line.cs            |    4 ++--
 LongoMatch.Core/Store/Drawables/MultiPoints.cs     |    4 ++--
 LongoMatch.Core/Store/Drawables/Quadrilateral.cs   |    4 ++--
 LongoMatch.Core/Store/Drawables/Rectangle.cs       |    4 ++--
 LongoMatch.Core/Store/Drawables/Selection.cs       |    6 +++---
 LongoMatch.Core/Store/Drawables/Text.cs            |    4 ++--
 LongoMatch.Core/Store/EventType.cs                 |    4 ++--
 LongoMatch.Core/Store/FrameDrawing.cs              |    6 +++---
 LongoMatch.Core/Store/HotKey.cs                    |    4 ++--
 LongoMatch.Core/Store/MediaFile.cs                 |    4 ++--
 LongoMatch.Core/Store/PenaltyCard.cs               |    4 ++--
 LongoMatch.Core/Store/Period.cs                    |    2 +-
 LongoMatch.Core/Store/PixbufTimeNode.cs            |    4 ++--
 LongoMatch.Core/Store/Player.cs                    |    6 +++---
 LongoMatch.Core/Store/Playlists/Playlist.cs        |    4 ++--
 LongoMatch.Core/Store/Playlists/PlaylistDrawing.cs |    6 +++---
 LongoMatch.Core/Store/Playlists/PlaylistImage.cs   |    6 +++---
 .../Store/Playlists/PlaylistPlayElement.cs         |    6 +++---
 LongoMatch.Core/Store/Point.cs                     |    2 +-
 LongoMatch.Core/Store/Project.cs                   |   12 ++++++------
 LongoMatch.Core/Store/ProjectDescription.cs        |    6 +++---
 LongoMatch.Core/Store/Score.cs                     |    2 +-
 LongoMatch.Core/Store/Tag.cs                       |    6 +++---
 LongoMatch.Core/Store/Templates/Dashboard.cs       |    8 ++++----
 LongoMatch.Core/Store/Templates/TeamTemplate.cs    |    6 +++---
 LongoMatch.Core/Store/Time.cs                      |    4 ++--
 LongoMatch.Core/Store/TimeNode.cs                  |    4 ++--
 LongoMatch.Core/Store/TimelineEvent.cs             |    4 ++--
 LongoMatch.Core/Store/TimelineNode.cs              |    4 ++--
 LongoMatch.Core/Store/Timer.cs                     |    4 ++--
 LongoMatch.Core/StyleConf.cs                       |    2 +-
 LongoMatch.Drawing.Cairo/CairoBackend.cs           |   18 +++++++++---------
 LongoMatch.Drawing.Cairo/CairoContext.cs           |    2 +-
 LongoMatch.Drawing.Cairo/Surface.cs                |    4 ++--
 LongoMatch.Drawing.Cairo/WidgetWrapper.cs          |   12 ++++++------
 LongoMatch.Drawing/Canvas.cs                       |    8 ++++----
 LongoMatch.Drawing/CanvasObjects/BenchObject.cs    |    6 +++---
 LongoMatch.Drawing/CanvasObjects/CanvasObject.cs   |    6 +++---
 LongoMatch.Drawing/CanvasObjects/CardObject.cs     |    6 +++---
 LongoMatch.Drawing/CanvasObjects/CategoryLabel.cs  |    6 +++---
 LongoMatch.Drawing/CanvasObjects/CategoryObject.cs |   12 ++++++------
 LongoMatch.Drawing/CanvasObjects/CounterObject.cs  |    8 ++++----
 LongoMatch.Drawing/CanvasObjects/CrossObject.cs    |    8 ++++----
 LongoMatch.Drawing/CanvasObjects/EllipseObject.cs  |    8 ++++----
 LongoMatch.Drawing/CanvasObjects/FieldObject.cs    |    6 +++---
 LongoMatch.Drawing/CanvasObjects/LineObject.cs     |    8 ++++----
 LongoMatch.Drawing/CanvasObjects/PlayObject.cs     |   10 +++++-----
 LongoMatch.Drawing/CanvasObjects/PlayerObject.cs   |   10 +++++-----
 .../CanvasObjects/PlayersTaggerObject.cs           |   12 ++++++------
 LongoMatch.Drawing/CanvasObjects/PositionObject.cs |   10 +++++-----
 .../CanvasObjects/QuadrilateralObject.cs           |    8 ++++----
 .../CanvasObjects/RectangleObject.cs               |    8 ++++----
 LongoMatch.Drawing/CanvasObjects/ScoreObject.cs    |    8 ++++----
 LongoMatch.Drawing/CanvasObjects/TagObject.cs      |    8 ++++----
 LongoMatch.Drawing/CanvasObjects/TaggerObject.cs   |   12 ++++++------
 LongoMatch.Drawing/CanvasObjects/TextObject.cs     |    8 ++++----
 LongoMatch.Drawing/CanvasObjects/TimeNodeObject.cs |   10 +++++-----
 LongoMatch.Drawing/CanvasObjects/TimelineObject.cs |   10 +++++-----
 LongoMatch.Drawing/CanvasObjects/TimerObject.cs    |    8 ++++----
 LongoMatch.Drawing/Constants.cs                    |    6 +++---
 LongoMatch.Drawing/Makefile.am                     |    2 +-
 LongoMatch.Drawing/PlayslistCellRenderer.cs        |    8 ++++----
 LongoMatch.Drawing/Utils.cs                        |    8 ++++----
 LongoMatch.Drawing/Widgets/Blackboard.cs           |   12 ++++++------
 LongoMatch.Drawing/Widgets/CategoriesLabels.cs     |    6 +++---
 LongoMatch.Drawing/Widgets/DashboardCanvas.cs      |   18 +++++++++---------
 LongoMatch.Drawing/Widgets/PlaysTimeline.cs        |   10 +++++-----
 LongoMatch.Drawing/Widgets/PositionTagger.cs       |   10 +++++-----
 LongoMatch.Drawing/Widgets/TeamTagger.cs           |   12 ++++++------
 LongoMatch.Drawing/Widgets/TimersTimeline.cs       |   10 +++++-----
 LongoMatch.Drawing/Widgets/Timerule.cs             |    8 ++++----
 LongoMatch.GUI.Helpers/Misc.cs                     |   10 +++++-----
 LongoMatch.GUI.Multimedia/Gui/CapturerBin.cs       |   10 +++++-----
 LongoMatch.GUI.Multimedia/Gui/PlayerBin.cs         |   15 ++++++++-------
 LongoMatch.GUI.Multimedia/Gui/PlayerCapturerBin.cs |   12 ++++++------
 .../Gui/Utils/FramesCapturer.cs                    |   10 +++++-----
 LongoMatch.GUI.Multimedia/Gui/Utils/Remuxer.cs     |    6 +++---
 LongoMatch.GUI.Multimedia/Gui/VolumeWindow.cs      |    2 +-
 LongoMatch.GUI.Multimedia/MultimediaToolkit.cs     |    4 ++--
 LongoMatch.GUI/Gui/Cairo.cs                        |    2 +-
 LongoMatch.GUI/Gui/Component/AnalysisComponent.cs  |    6 +++---
 LongoMatch.GUI/Gui/Component/BackgroundWidget.cs   |    2 +-
 LongoMatch.GUI/Gui/Component/ButtonTagger.cs       |    2 +-
 LongoMatch.GUI/Gui/Component/CategoryProperties.cs |    8 ++++----
 LongoMatch.GUI/Gui/Component/CodingWidget.cs       |    6 +++---
 LongoMatch.GUI/Gui/Component/CoordinatesTagger.cs  |    4 ++--
 LongoMatch.GUI/Gui/Component/DashboardWidget.cs    |   12 ++++++------
 LongoMatch.GUI/Gui/Component/DrawingToolBox.cs     |    2 +-
 LongoMatch.GUI/Gui/Component/GameUnitWidget.cs     |    2 +-
 LongoMatch.GUI/Gui/Component/GameUnitsTagger.cs    |    2 +-
 .../Gui/Component/GeneralPreferencesPanel.cs       |    2 +-
 LongoMatch.GUI/Gui/Component/MediaFileChooser.cs   |    2 +-
 LongoMatch.GUI/Gui/Component/NotesWidget.cs        |    4 ++--
 LongoMatch.GUI/Gui/Component/PeriodsRecoder.cs     |    2 +-
 LongoMatch.GUI/Gui/Component/PlayListWidget.cs     |   10 +++++-----
 .../Gui/Component/PlayersListTreeWidget.cs         |   10 +++++-----
 .../Gui/Component/PlaysCoordinatesTagger.cs        |   10 +++++-----
 .../Gui/Component/PlaysListTreeWidget.cs           |    6 +++---
 .../Gui/Component/PlaysPositionViewer.cs           |    4 ++--
 .../Gui/Component/PlaysSelectionWidget.cs          |    8 ++++----
 .../Gui/Component/ProjectDetailsWidget.cs          |    2 +-
 LongoMatch.GUI/Gui/Component/ProjectListWidget.cs  |    6 +++---
 LongoMatch.GUI/Gui/Component/ProjectPeriods.cs     |    2 +-
 LongoMatch.GUI/Gui/Component/RenderingStateBar.cs  |    2 +-
 .../Gui/Component/Stats/CategoriesViewer.cs        |    6 +++---
 .../Gui/Component/Stats/CategoryViewer.cs          |    8 ++++----
 LongoMatch.GUI/Gui/Component/Stats/GameViewer.cs   |    6 +++---
 .../Gui/Component/Stats/PlayerCategoriesViewer.cs  |    4 ++--
 .../Gui/Component/Stats/PlayerCategoryViewer.cs    |    8 ++++----
 .../Gui/Component/Stats/PlayerSubcategoryViewer.cs |    4 ++--
 .../Gui/Component/Stats/PlayersViewer.cs           |    8 ++++----
 LongoMatch.GUI/Gui/Component/Stats/Plotter.cs      |    4 ++--
 .../Gui/Component/Stats/SubcategoryViewer.cs       |    4 ++--
 LongoMatch.GUI/Gui/Component/TeamTemplateEditor.cs |   10 +++++-----
 LongoMatch.GUI/Gui/Component/TeamsComboBox.cs      |    4 ++--
 LongoMatch.GUI/Gui/Component/TimeScale.cs          |    2 +-
 LongoMatch.GUI/Gui/Component/Timeline.cs           |    8 ++++----
 .../Gui/Component/VideoPreferencesPanel.cs         |    2 +-
 LongoMatch.GUI/Gui/Dialog/About.cs                 |    2 +-
 LongoMatch.GUI/Gui/Dialog/BusyDialog.cs            |    2 +-
 LongoMatch.GUI/Gui/Dialog/DatabasesManager.cs      |    2 +-
 LongoMatch.GUI/Gui/Dialog/DrawingTool.cs           |   14 +++++++-------
 LongoMatch.GUI/Gui/Dialog/EditCategoryDialog.cs    |    2 +-
 LongoMatch.GUI/Gui/Dialog/EndCaptureDialog.cs      |    2 +-
 .../Gui/Dialog/FramesCaptureProgressDialog.cs      |    4 ++--
 LongoMatch.GUI/Gui/Dialog/HotKeySelectorDialog.cs  |    2 +-
 LongoMatch.GUI/Gui/Dialog/PlayEditor.cs            |    4 ++--
 LongoMatch.GUI/Gui/Dialog/RenderingJobsDialog.cs   |    4 ++--
 LongoMatch.GUI/Gui/Dialog/SnapshotsDialog.cs       |    4 ++--
 LongoMatch.GUI/Gui/Dialog/StatsViewer.cs           |    4 ++--
 LongoMatch.GUI/Gui/Dialog/VideoConversionTool.cs   |    6 +++---
 .../Gui/Dialog/VideoEditionProperties.cs           |    2 +-
 LongoMatch.GUI/Gui/GUIToolkit.cs                   |   12 ++++++------
 LongoMatch.GUI/Gui/MainWindow.cs                   |   14 +++++++-------
 LongoMatch.GUI/Gui/Menu/PlaysMenu.cs               |    6 +++---
 LongoMatch.GUI/Gui/Panel/NewProjectPanel.cs        |   14 +++++++-------
 LongoMatch.GUI/Gui/Panel/OpenProjectPanel.cs       |    6 +++---
 LongoMatch.GUI/Gui/Panel/PanelHeader.cs            |    2 +-
 LongoMatch.GUI/Gui/Panel/PreferencesPanel.cs       |    4 ++--
 LongoMatch.GUI/Gui/Panel/ProjectsManagerPanel.cs   |   14 +++++++-------
 LongoMatch.GUI/Gui/Panel/SportsTemplatesPanel.cs   |   10 +++++-----
 LongoMatch.GUI/Gui/Panel/TeamsTemplatesPanel.cs    |   14 +++++++-------
 LongoMatch.GUI/Gui/Panel/WelcomePanel.cs           |    4 ++--
 LongoMatch.GUI/Gui/Popup/CalendarPopup.cs          |    2 +-
 .../Gui/TreeView/CategoriesFilterTreeView.cs       |    8 ++++----
 LongoMatch.GUI/Gui/TreeView/FilterBaseView.cs      |    6 +++---
 LongoMatch.GUI/Gui/TreeView/ListTreeViewBase.cs    |   10 +++++-----
 LongoMatch.GUI/Gui/TreeView/PlayListTreeView.cs    |    6 +++---
 .../Gui/TreeView/PlayersFilterTreeView.cs          |    6 +++---
 LongoMatch.GUI/Gui/TreeView/PlayersTreeView.cs     |    4 ++--
 LongoMatch.GUI/Gui/TreeView/PlaysTreeView.cs       |    8 ++++----
 .../Gui/TreeView/RenderingJobsTreeView.cs          |    2 +-
 LongoMatch.Migration/Common/Color.cs               |    2 +-
 LongoMatch.Migration/Common/Config.cs              |    2 +-
 LongoMatch.Migration/Common/Constants.cs           |    2 +-
 LongoMatch.Migration/Common/Enums.cs               |    2 +-
 LongoMatch.Migration/Common/Image.cs               |    2 +-
 LongoMatch.Migration/Common/SerializableObject.cs  |    8 ++++----
 LongoMatch.Migration/Converter.cs                  |    8 ++++----
 LongoMatch.Migration/Core/Category.cs              |   16 ++++++++--------
 LongoMatch.Migration/Core/Coordinates.cs           |    2 +-
 LongoMatch.Migration/Core/Drawing.cs               |    4 ++--
 LongoMatch.Migration/Core/GameUnit.cs              |    2 +-
 LongoMatch.Migration/Core/GameUnitsList.cs         |    4 ++--
 LongoMatch.Migration/Core/HotKey.cs                |    4 ++--
 .../Core/Interfaces/ISubCategory.cs                |    2 +-
 LongoMatch.Migration/Core/Interfaces/ITag.cs       |    4 ++--
 LongoMatch.Migration/Core/Interfaces/ITemplates.cs |    6 +++---
 .../Core/Interfaces/ITimelineNode.cs               |    4 ++--
 LongoMatch.Migration/Core/MediaFile.cs             |    4 ++--
 LongoMatch.Migration/Core/Period.cs                |    2 +-
 LongoMatch.Migration/Core/PixbufTimeNode.cs        |    4 ++--
 LongoMatch.Migration/Core/Play.cs                  |    6 +++---
 LongoMatch.Migration/Core/PlayListPlay.cs          |    2 +-
 LongoMatch.Migration/Core/Player.cs                |    4 ++--
 LongoMatch.Migration/Core/Point.cs                 |    2 +-
 LongoMatch.Migration/Core/Project.cs               |   10 +++++-----
 LongoMatch.Migration/Core/ProjectDescription.cs    |    4 ++--
 LongoMatch.Migration/Core/SubCategory.cs           |    6 +++---
 LongoMatch.Migration/Core/Tag.cs                   |    6 +++---
 LongoMatch.Migration/Core/TagStore.cs              |    8 ++++----
 .../Core/Templates/CategoriesTemplate.cs           |    8 ++++----
 .../Core/Templates/SubCategoryTemplate.cs          |    8 ++++----
 .../Core/Templates/TeamTemplate.cs                 |    6 +++---
 LongoMatch.Migration/Core/Time.cs                  |    4 ++--
 LongoMatch.Migration/Core/TimeNode.cs              |    4 ++--
 LongoMatch.Migration/Core/TimelineNode.cs          |    4 ++--
 LongoMatch.Migration/Core/Timer.cs                 |    4 ++--
 LongoMatch.Migration/DataBase.cs                   |    8 ++++----
 LongoMatch.Migration/MainWindow.cs                 |    2 +-
 LongoMatch.Migration/Tests/CateogiresTest.cs       |    4 ++--
 LongoMatch.Migration/Tests/TestProject.cs          |    4 ++--
 LongoMatch.Migration/Tests/TestTeam.cs             |    4 ++--
 LongoMatch.Multimedia/Capturer/FakeCapturer.cs     |   10 +++++-----
 .../Capturer/GstCameraCapturer.cs                  |    8 ++++----
 LongoMatch.Multimedia/Capturer/LiveSourceTimer.cs  |    4 ++--
 LongoMatch.Multimedia/Common/Handlers.cs           |    4 ++--
 .../Converter/GstVideoConverter.cs                 |    8 ++++----
 LongoMatch.Multimedia/Editor/GstVideoSplitter.cs   |   10 +++++-----
 LongoMatch.Multimedia/Player/GstPlayer.cs          |    8 ++++----
 LongoMatch.Multimedia/Remuxer/GstRemuxer.cs        |    8 ++++----
 LongoMatch.Multimedia/Remuxer/MpegRemuxer.cs       |    4 ++--
 LongoMatch.Multimedia/Utils/GStreamer.cs           |    3 ++-
 LongoMatch.Multimedia/Utils/GstDiscoverer.cs       |    8 ++++----
 LongoMatch.Multimedia/Utils/MultimediaFactory.cs   |    6 +++---
 LongoMatch.Multimedia/Utils/Seeker.cs              |    2 +-
 LongoMatch.Multimedia/Utils/VideoDevice.cs         |    2 +-
 LongoMatch.Plugins/CSVExporter.cs                  |    6 +++---
 LongoMatch.Services/LongoMatch.Services.mdp        |    2 +-
 LongoMatch.Services/Makefile.am                    |    2 +-
 .../Services/{Core.cs => CoreServices.cs}          |   10 +++++-----
 LongoMatch.Services/Services/DataBaseManager.cs    |    8 ++++----
 LongoMatch.Services/Services/EventsManager.cs      |   12 ++++++------
 LongoMatch.Services/Services/FileDB.cs             |    6 +++---
 LongoMatch.Services/Services/HotKeysManager.cs     |    6 +++---
 LongoMatch.Services/Services/PlaylistManager.cs    |   10 +++++-----
 LongoMatch.Services/Services/ProjectsManager.cs    |   10 +++++-----
 .../Services/RenderingJobsManager.cs               |   12 ++++++------
 LongoMatch.Services/Services/TemplatesService.cs   |    8 ++++----
 LongoMatch.Services/Services/ToolsManager.cs       |   10 +++++-----
 LongoMatch/Main.cs                                 |   10 +++++-----
 Tests/Core/Drawables/TestAngle.cs                  |    4 ++--
 Tests/Core/Drawables/TestCross.cs                  |    4 ++--
 Tests/Core/Drawables/TestDrawable.cs               |    4 ++--
 Tests/Core/Drawables/TestEllipse.cs                |    4 ++--
 Tests/Core/Drawables/TestLine.cs                   |    4 ++--
 Tests/Core/Drawables/TestMultipoints.cs            |    4 ++--
 Tests/Core/Drawables/TestQuadrilateral.cs          |    4 ++--
 Tests/Core/Drawables/TestRectangle.cs              |    4 ++--
 Tests/Core/Drawables/TestText.cs                   |    6 +++---
 Tests/Core/TestCategoriesTemplate.cs               |    6 +++---
 Tests/Core/TestCategory.cs                         |    4 ++--
 Tests/Core/TestColor.cs                            |    2 +-
 Tests/Core/TestCoordinates.cs                      |    4 ++--
 Tests/Core/TestMediaFile.cs                        |    4 ++--
 Tests/Core/TestPlay.cs                             |    6 +++---
 Tests/Core/TestPlayer.cs                           |    4 ++--
 Tests/Core/TestPlaysFilter.cs                      |    6 +++---
 Tests/Core/TestPoint.cs                            |    4 ++--
 Tests/Core/TestProject.cs                          |    6 +++---
 Tests/Core/TestProjectDescription.cs               |    4 ++--
 Tests/Core/TestTeamTemplate.cs                     |    6 +++---
 Tests/Core/TestTime.cs                             |    2 +-
 Tests/Core/TestTimeNode.cs                         |    4 ++--
 Tests/Services/TestDatabase.cs                     |    2 +-
 Tests/Utils.cs                                     |    2 +-
 319 files changed, 912 insertions(+), 916 deletions(-)
---
diff --git a/LongoMatch.Addins/AddinsManager.cs b/LongoMatch.Addins/AddinsManager.cs
index 20f4111..11e4afd 100644
--- a/LongoMatch.Addins/AddinsManager.cs
+++ b/LongoMatch.Addins/AddinsManager.cs
@@ -16,16 +16,13 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 // 
 using System;
-using System.IO;
-using Mono.Addins;
-
-using LongoMatch;
 using LongoMatch.Addins.ExtensionPoints;
-using LongoMatch.Interfaces.GUI;
-using LongoMatch.Store;
-using LongoMatch.Interfaces.Multimedia;
-using System.Collections.Generic;
-using LongoMatch.Interfaces;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Interfaces;
+using LongoMatch.Core.Interfaces.GUI;
+using LongoMatch.Core.Interfaces.Multimedia;
+using LongoMatch.Core.Store;
+using Mono.Addins;
 
 [assembly:AddinRoot ("LongoMatch", "1.0")]
 
diff --git a/LongoMatch.Addins/ExtensionPoints/IConfigModifier.cs 
b/LongoMatch.Addins/ExtensionPoints/IConfigModifier.cs
index 1b23f86..649e312 100644
--- a/LongoMatch.Addins/ExtensionPoints/IConfigModifier.cs
+++ b/LongoMatch.Addins/ExtensionPoints/IConfigModifier.cs
@@ -19,7 +19,7 @@ using System;
 using Mono.Addins;
 
 using LongoMatch;
-using LongoMatch.Store;
+using LongoMatch.Core.Store;
 
 namespace LongoMatch.Addins.ExtensionPoints
 {
diff --git a/LongoMatch.Addins/ExtensionPoints/IExportProject.cs 
b/LongoMatch.Addins/ExtensionPoints/IExportProject.cs
index 05816d5..b3aeb46 100644
--- a/LongoMatch.Addins/ExtensionPoints/IExportProject.cs
+++ b/LongoMatch.Addins/ExtensionPoints/IExportProject.cs
@@ -18,8 +18,8 @@
 using System;
 using Mono.Addins;
 
-using LongoMatch.Store;
-using LongoMatch.Interfaces.GUI;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Interfaces.GUI;
 
 namespace LongoMatch.Addins.ExtensionPoints
 {
diff --git a/LongoMatch.Addins/ExtensionPoints/IImportProject.cs 
b/LongoMatch.Addins/ExtensionPoints/IImportProject.cs
index 606dbb2..0d25ab2 100644
--- a/LongoMatch.Addins/ExtensionPoints/IImportProject.cs
+++ b/LongoMatch.Addins/ExtensionPoints/IImportProject.cs
@@ -18,8 +18,8 @@
 using System;
 using Mono.Addins;
 
-using LongoMatch.Store;
-using LongoMatch.Interfaces.GUI;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Interfaces.GUI;
 
 namespace LongoMatch.Addins.ExtensionPoints
 {
diff --git a/LongoMatch.Addins/ExtensionPoints/IMultimediaBackend.cs 
b/LongoMatch.Addins/ExtensionPoints/IMultimediaBackend.cs
index dd8ab2f..ed2c59a 100644
--- a/LongoMatch.Addins/ExtensionPoints/IMultimediaBackend.cs
+++ b/LongoMatch.Addins/ExtensionPoints/IMultimediaBackend.cs
@@ -20,7 +20,7 @@
 
 using System;
 using Mono.Addins;
-using LongoMatch.Interfaces.Multimedia;
+using LongoMatch.Core.Interfaces.Multimedia;
 
 
 namespace LongoMatch.Addins.ExtensionPoints 
diff --git a/LongoMatch.Core/Common/Area.cs b/LongoMatch.Core/Common/Area.cs
index 7ba225f..d4b0db9 100644
--- a/LongoMatch.Core/Common/Area.cs
+++ b/LongoMatch.Core/Common/Area.cs
@@ -16,9 +16,8 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 using System;
-using LongoMatch.Common;
 
-namespace LongoMatch.Common
+namespace LongoMatch.Core.Common
 {
        [Serializable]
        public class Area
diff --git a/LongoMatch.Core/Common/CaptureSettings.cs b/LongoMatch.Core/Common/CaptureSettings.cs
index a30252a..95e87e3 100644
--- a/LongoMatch.Core/Common/CaptureSettings.cs
+++ b/LongoMatch.Core/Common/CaptureSettings.cs
@@ -18,7 +18,7 @@
 
 using System;
 
-namespace LongoMatch.Common
+namespace LongoMatch.Core.Common
 {
 
        public struct CaptureSettings
diff --git a/LongoMatch.Core/Common/Cloner.cs b/LongoMatch.Core/Common/Cloner.cs
index e2777e2..a6071a1 100644
--- a/LongoMatch.Core/Common/Cloner.cs
+++ b/LongoMatch.Core/Common/Cloner.cs
@@ -18,9 +18,7 @@
 using System;
 using System.IO;
 
-using LongoMatch.Common;
-
-namespace LongoMatch.Common
+namespace LongoMatch.Core.Common
 {
        public static class Cloner
        {
diff --git a/LongoMatch.Core/Common/Color.cs b/LongoMatch.Core/Common/Color.cs
index 53dcb2e..d2fd0b3 100644
--- a/LongoMatch.Core/Common/Color.cs
+++ b/LongoMatch.Core/Common/Color.cs
@@ -18,7 +18,7 @@
 using System;
 using Newtonsoft.Json;
 
-namespace LongoMatch.Common
+namespace LongoMatch.Core.Common
 {
        [JsonConverter (typeof (LongoMatchConverter))]
        [Serializable]
diff --git a/LongoMatch.Core/Common/ConsoleCrayon.cs b/LongoMatch.Core/Common/ConsoleCrayon.cs
index 44d06e4..afde6ed 100644
--- a/LongoMatch.Core/Common/ConsoleCrayon.cs
+++ b/LongoMatch.Core/Common/ConsoleCrayon.cs
@@ -28,7 +28,7 @@
 
 using System;
 
-namespace LongoMatch
+namespace LongoMatch.Core.Common
 {
        public static class ConsoleCrayon
        {
diff --git a/LongoMatch.Core/Common/Constants.cs b/LongoMatch.Core/Common/Constants.cs
index df4c131..898fd95 100644
--- a/LongoMatch.Core/Common/Constants.cs
+++ b/LongoMatch.Core/Common/Constants.cs
@@ -22,7 +22,7 @@ using Gdk;
 #endif
 
 
-namespace LongoMatch.Common
+namespace LongoMatch.Core.Common
 {
        public class Constants {
                public const string SOFTWARE_NAME = "LongoMatch";
diff --git a/LongoMatch.Core/Common/Device.cs b/LongoMatch.Core/Common/Device.cs
index babdf04..23f48f3 100644
--- a/LongoMatch.Core/Common/Device.cs
+++ b/LongoMatch.Core/Common/Device.cs
@@ -21,7 +21,7 @@ using System.Collections.Generic;
 using Mono.Unix;
 
 
-namespace LongoMatch.Common
+namespace LongoMatch.Core.Common
 {
 
 
diff --git a/LongoMatch.Core/Common/EncodingProfiles.cs b/LongoMatch.Core/Common/EncodingProfiles.cs
index 9365159..66b985c 100644
--- a/LongoMatch.Core/Common/EncodingProfiles.cs
+++ b/LongoMatch.Core/Common/EncodingProfiles.cs
@@ -19,7 +19,7 @@ using System;
 using System.Collections.Generic;
 
 
-namespace LongoMatch.Common
+namespace LongoMatch.Core.Common
 {
        [Serializable]
        public class EncodingProfile
diff --git a/LongoMatch.Core/Common/EncodingQuality.cs b/LongoMatch.Core/Common/EncodingQuality.cs
index 5423f50..aebcf2d 100644
--- a/LongoMatch.Core/Common/EncodingQuality.cs
+++ b/LongoMatch.Core/Common/EncodingQuality.cs
@@ -19,7 +19,7 @@ using System;
 using Mono.Unix;
 using System.Collections.Generic;
 
-namespace LongoMatch.Common
+namespace LongoMatch.Core.Common
 {
        
        [Serializable]
diff --git a/LongoMatch.Core/Common/EncodingSettings.cs b/LongoMatch.Core/Common/EncodingSettings.cs
index 3c1242d..5fd4039 100644
--- a/LongoMatch.Core/Common/EncodingSettings.cs
+++ b/LongoMatch.Core/Common/EncodingSettings.cs
@@ -16,7 +16,7 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 // 
 using System;
-namespace LongoMatch.Common
+namespace LongoMatch.Core.Common
 {
        [Serializable]
        public struct EncodingSettings
diff --git a/LongoMatch.Core/Common/Enums.cs b/LongoMatch.Core/Common/Enums.cs
index 4d1f524..f4d5dd6 100644
--- a/LongoMatch.Core/Common/Enums.cs
+++ b/LongoMatch.Core/Common/Enums.cs
@@ -18,7 +18,7 @@
 
 using System;
 
-namespace LongoMatch.Common
+namespace LongoMatch.Core.Common
 {
 
        public enum SerializationType {
diff --git a/LongoMatch.Core/Common/EventsBroker.cs b/LongoMatch.Core/Common/EventsBroker.cs
index bc43918..3e89e1c 100644
--- a/LongoMatch.Core/Common/EventsBroker.cs
+++ b/LongoMatch.Core/Common/EventsBroker.cs
@@ -16,14 +16,14 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 using System;
-using LongoMatch.Handlers;
+using LongoMatch.Core.Handlers;
 using System.Collections.Generic;
-using LongoMatch.Store;
-using LongoMatch.Store.Playlists;
-using LongoMatch.Interfaces;
-using LongoMatch.Interfaces.GUI;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Store.Playlists;
+using LongoMatch.Core.Interfaces;
+using LongoMatch.Core.Interfaces.GUI;
 
-namespace LongoMatch.Common
+namespace LongoMatch.Core.Common
 {
        public class EventsBroker
        {
diff --git a/LongoMatch.Core/Common/Exceptions.cs b/LongoMatch.Core/Common/Exceptions.cs
index 29e851f..0f5abcf 100644
--- a/LongoMatch.Core/Common/Exceptions.cs
+++ b/LongoMatch.Core/Common/Exceptions.cs
@@ -18,7 +18,7 @@
 using System;
 using Mono.Unix;
 
-namespace LongoMatch.Common
+namespace LongoMatch.Core.Common
 {
        public class DBLockedException: Exception
        {
diff --git a/LongoMatch.Core/Common/ExtensionMethods.cs b/LongoMatch.Core/Common/ExtensionMethods.cs
index cbbb0ac..45a4627 100644
--- a/LongoMatch.Core/Common/ExtensionMethods.cs
+++ b/LongoMatch.Core/Common/ExtensionMethods.cs
@@ -19,7 +19,7 @@ using System;
 using System.Linq;
 using System.Collections.Generic;
 
-namespace LongoMatch.Common
+namespace LongoMatch.Core.Common
 {
        public static class ExtensionMethods
        {
diff --git a/LongoMatch.Core/Common/Gettext.cs b/LongoMatch.Core/Common/Gettext.cs
index 30c76ca..cb80be7 100644
--- a/LongoMatch.Core/Common/Gettext.cs
+++ b/LongoMatch.Core/Common/Gettext.cs
@@ -20,7 +20,7 @@ using System.IO;
 using System.Collections.Generic;
 using System.Globalization;
 
-namespace LongoMatch.Common
+namespace LongoMatch.Core.Common
 {
        public class Gettext
        {
diff --git a/LongoMatch.Core/Common/Image.cs b/LongoMatch.Core/Common/Image.cs
index d05cc64..d7fb49a 100644
--- a/LongoMatch.Core/Common/Image.cs
+++ b/LongoMatch.Core/Common/Image.cs
@@ -18,7 +18,7 @@
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 
-namespace LongoMatch.Common
+namespace LongoMatch.Core.Common
 {
        using System;
        using System.IO;
diff --git a/LongoMatch.Core/Common/Job.cs b/LongoMatch.Core/Common/Job.cs
index 445ea6d..6b3fbab 100644
--- a/LongoMatch.Core/Common/Job.cs
+++ b/LongoMatch.Core/Common/Job.cs
@@ -18,11 +18,11 @@
 using System;
 using System.Collections.Generic;
 
-using LongoMatch.Common;
-using LongoMatch.Store;
-using LongoMatch.Store.Playlists;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Store.Playlists;
 
-namespace LongoMatch.Common
+namespace LongoMatch.Core.Common
 {
        [Serializable]
        public class Job
diff --git a/LongoMatch.Core/Common/Log.cs b/LongoMatch.Core/Common/Log.cs
index 0c0aadd..42e4fc5 100644
--- a/LongoMatch.Core/Common/Log.cs
+++ b/LongoMatch.Core/Common/Log.cs
@@ -31,7 +31,7 @@ using System.Text;
 using System.Collections.Generic;
 using System.Threading;
 
-namespace LongoMatch
+namespace LongoMatch.Core.Common
 {
        public delegate void LogNotifyHandler(LogNotifyArgs args);
 
diff --git a/LongoMatch.Core/Common/PlaysFilter.cs b/LongoMatch.Core/Common/PlaysFilter.cs
index 3504666..362ed94 100644
--- a/LongoMatch.Core/Common/PlaysFilter.cs
+++ b/LongoMatch.Core/Common/PlaysFilter.cs
@@ -19,10 +19,10 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-using LongoMatch.Handlers;
-using LongoMatch.Store;
+using LongoMatch.Core.Handlers;
+using LongoMatch.Core.Store;
 
-namespace LongoMatch.Common
+namespace LongoMatch.Core.Common
 {
        public class PlaysFilter
        {
diff --git a/LongoMatch.Core/Common/Serializer.cs b/LongoMatch.Core/Common/Serializer.cs
index c780981..08f8b71 100644
--- a/LongoMatch.Core/Common/Serializer.cs
+++ b/LongoMatch.Core/Common/Serializer.cs
@@ -23,15 +23,15 @@ using System.Runtime.Serialization.Formatters.Binary;
 using System.Xml.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
-using LongoMatch.Interfaces;
+using LongoMatch.Core.Interfaces;
 using System.Reflection;
-using LongoMatch.Store.Templates;
+using LongoMatch.Core.Store.Templates;
 using Newtonsoft.Json.Converters;
-using LongoMatch.Store;
+using LongoMatch.Core.Store;
 using System.Globalization;
 using System.Text;
 
-namespace LongoMatch.Common
+namespace LongoMatch.Core.Common
 {
        public class Serializer
        {
diff --git a/LongoMatch.Core/Common/SysInfo.cs b/LongoMatch.Core/Common/SysInfo.cs
index d73b603..14ba7b4 100644
--- a/LongoMatch.Core/Common/SysInfo.cs
+++ b/LongoMatch.Core/Common/SysInfo.cs
@@ -19,7 +19,7 @@ using System;
 using System.IO;
 using System.Reflection;
 
-namespace LongoMatch.Common
+namespace LongoMatch.Core.Common
 {
        public class SysInfo
        {
diff --git a/LongoMatch.Core/Common/VideoStandards.cs b/LongoMatch.Core/Common/VideoStandards.cs
index 1412389..ee282d4 100644
--- a/LongoMatch.Core/Common/VideoStandards.cs
+++ b/LongoMatch.Core/Common/VideoStandards.cs
@@ -19,7 +19,7 @@ using System;
 using Mono.Unix;
 using System.Collections.Generic;
 
-namespace LongoMatch.Common
+namespace LongoMatch.Core.Common
 {
        [Serializable]
        public class VideoStandard
diff --git a/LongoMatch.Core/Config.cs b/LongoMatch.Core/Config.cs
index ad9cad7..87f201b 100644
--- a/LongoMatch.Core/Config.cs
+++ b/LongoMatch.Core/Config.cs
@@ -18,11 +18,11 @@
 using System;
 using System.IO;
 
-using LongoMatch.Common;
-using LongoMatch.Interfaces;
-using LongoMatch.Interfaces.GUI;
-using LongoMatch.Interfaces.Multimedia;
-using LongoMatch.Interfaces.Drawing;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Interfaces;
+using LongoMatch.Core.Interfaces.GUI;
+using LongoMatch.Core.Interfaces.Multimedia;
+using LongoMatch.Core.Interfaces.Drawing;
 
 namespace LongoMatch
 {
diff --git a/LongoMatch.Core/Handlers/Drawing.cs b/LongoMatch.Core/Handlers/Drawing.cs
index dc11f75..92989aa 100644
--- a/LongoMatch.Core/Handlers/Drawing.cs
+++ b/LongoMatch.Core/Handlers/Drawing.cs
@@ -16,10 +16,10 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 using System;
-using LongoMatch.Common;
-using LongoMatch.Interfaces.Drawing;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Interfaces.Drawing;
 
-namespace LongoMatch.Handlers.Drawing
+namespace LongoMatch.Core.Handlers.Drawing
 {
        public delegate void DrawingHandler (IContext context, Area area);
        public delegate void ButtonPressedHandler (Point coords, uint time, ButtonType type, ButtonModifier 
modifier);
diff --git a/LongoMatch.Core/Handlers/Handlers.cs b/LongoMatch.Core/Handlers/Handlers.cs
index 0b831c7..7c02ac3 100644
--- a/LongoMatch.Core/Handlers/Handlers.cs
+++ b/LongoMatch.Core/Handlers/Handlers.cs
@@ -20,15 +20,15 @@
 
 using System;
 using System.Collections.Generic;
-using LongoMatch.Common;
-using LongoMatch.Interfaces;
-using LongoMatch.Interfaces.Drawing;
-using LongoMatch.Interfaces.GUI;
-using LongoMatch.Store;
-using LongoMatch.Store.Playlists;
-using LongoMatch.Store.Templates;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Interfaces;
+using LongoMatch.Core.Interfaces.Drawing;
+using LongoMatch.Core.Interfaces.GUI;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Store.Playlists;
+using LongoMatch.Core.Store.Templates;
 
-namespace LongoMatch.Handlers
+namespace LongoMatch.Core.Handlers
 {
 
        /*Tagging Events*/
diff --git a/LongoMatch.Core/Handlers/Multimedia.cs b/LongoMatch.Core/Handlers/Multimedia.cs
index a418bfb..71b4a45 100644
--- a/LongoMatch.Core/Handlers/Multimedia.cs
+++ b/LongoMatch.Core/Handlers/Multimedia.cs
@@ -18,10 +18,10 @@
 
 using System;
 
-using LongoMatch.Common;
-using LongoMatch.Store;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Store;
 
-namespace LongoMatch.Handlers
+namespace LongoMatch.Core.Handlers
 {
        public delegate void PlayListSegmentDoneHandler();
        public delegate void SegmentClosedHandler();
diff --git a/LongoMatch.Core/Interfaces/Drawing/ICanvas.cs b/LongoMatch.Core/Interfaces/Drawing/ICanvas.cs
index 7d1e6bd..a079c26 100644
--- a/LongoMatch.Core/Interfaces/Drawing/ICanvas.cs
+++ b/LongoMatch.Core/Interfaces/Drawing/ICanvas.cs
@@ -16,12 +16,12 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 using System;
-using LongoMatch.Interfaces;
-using LongoMatch.Common;
-using LongoMatch.Store.Drawables;
-using LongoMatch.Interfaces.Drawing;
+using LongoMatch.Core.Interfaces;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Store.Drawables;
+using LongoMatch.Core.Interfaces.Drawing;
 
-namespace LongoMatch.Interfaces.Drawing
+namespace LongoMatch.Core.Interfaces.Drawing
 {
 
        public interface ICanvas: IDisposable
diff --git a/LongoMatch.Core/Interfaces/Drawing/IDrawable.cs b/LongoMatch.Core/Interfaces/Drawing/IDrawable.cs
index 1def454..f91b467 100644
--- a/LongoMatch.Core/Interfaces/Drawing/IDrawable.cs
+++ b/LongoMatch.Core/Interfaces/Drawing/IDrawable.cs
@@ -16,10 +16,10 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 using System;
-using LongoMatch.Store.Drawables;
-using LongoMatch.Common;
+using LongoMatch.Core.Store.Drawables;
+using LongoMatch.Core.Common;
 
-namespace LongoMatch.Interfaces.Drawing
+namespace LongoMatch.Core.Interfaces.Drawing
 {
        public interface IMovableObject
        {
diff --git a/LongoMatch.Core/Interfaces/Drawing/IDrawingToolkit.cs 
b/LongoMatch.Core/Interfaces/Drawing/IDrawingToolkit.cs
index 1a65abc..d2ad5f6 100644
--- a/LongoMatch.Core/Interfaces/Drawing/IDrawingToolkit.cs
+++ b/LongoMatch.Core/Interfaces/Drawing/IDrawingToolkit.cs
@@ -16,10 +16,10 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 using System;
-using LongoMatch.Common;
+using LongoMatch.Core.Common;
 using System.Collections.Generic;
 
-namespace LongoMatch.Interfaces.Drawing
+namespace LongoMatch.Core.Interfaces.Drawing
 {
 
        public interface IContext:IDisposable {
diff --git a/LongoMatch.Core/Interfaces/Drawing/IWidget.cs b/LongoMatch.Core/Interfaces/Drawing/IWidget.cs
index 8025d2d..e207067 100644
--- a/LongoMatch.Core/Interfaces/Drawing/IWidget.cs
+++ b/LongoMatch.Core/Interfaces/Drawing/IWidget.cs
@@ -16,10 +16,10 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 using System;
-using LongoMatch.Handlers.Drawing;
-using LongoMatch.Common;
+using LongoMatch.Core.Handlers.Drawing;
+using LongoMatch.Core.Common;
 
-namespace LongoMatch.Interfaces.Drawing
+namespace LongoMatch.Core.Interfaces.Drawing
 {
        public interface IWidget: IDisposable
        {
diff --git a/LongoMatch.Core/Interfaces/GUI/IAnalysisWindow.cs 
b/LongoMatch.Core/Interfaces/GUI/IAnalysisWindow.cs
index 372d36a..9c2f499 100644
--- a/LongoMatch.Core/Interfaces/GUI/IAnalysisWindow.cs
+++ b/LongoMatch.Core/Interfaces/GUI/IAnalysisWindow.cs
@@ -18,12 +18,12 @@
 using System;
 using System.Collections.Generic;
 
-using LongoMatch.Common;
-using LongoMatch.Handlers;
-using LongoMatch.Store;
-using LongoMatch.Store.Templates;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Handlers;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Store.Templates;
 
-namespace LongoMatch.Interfaces.GUI
+namespace LongoMatch.Core.Interfaces.GUI
 {
        public interface IAnalysisWindow
        {       
diff --git a/LongoMatch.Core/Interfaces/GUI/IBusyDialog.cs b/LongoMatch.Core/Interfaces/GUI/IBusyDialog.cs
index b846447..24ec0d7 100644
--- a/LongoMatch.Core/Interfaces/GUI/IBusyDialog.cs
+++ b/LongoMatch.Core/Interfaces/GUI/IBusyDialog.cs
@@ -17,7 +17,7 @@
 // 
 using System;
 
-namespace LongoMatch.Interfaces.GUI
+namespace LongoMatch.Core.Interfaces.GUI
 {
        public interface IBusyDialog
        {
diff --git a/LongoMatch.Core/Interfaces/GUI/ICapturerBin.cs b/LongoMatch.Core/Interfaces/GUI/ICapturerBin.cs
index d6fa051..b49efde 100644
--- a/LongoMatch.Core/Interfaces/GUI/ICapturerBin.cs
+++ b/LongoMatch.Core/Interfaces/GUI/ICapturerBin.cs
@@ -17,12 +17,12 @@
 // 
 using System;
 
-using LongoMatch.Common;
-using LongoMatch.Handlers;
-using LongoMatch.Store;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Handlers;
+using LongoMatch.Core.Store;
 using System.Collections.Generic;
 
-namespace LongoMatch.Interfaces.GUI
+namespace LongoMatch.Core.Interfaces.GUI
 {
        public interface ICapturerBin
        {
diff --git a/LongoMatch.Core/Interfaces/GUI/IGUIToolkit.cs b/LongoMatch.Core/Interfaces/GUI/IGUIToolkit.cs
index 69e433e..ea828f1 100644
--- a/LongoMatch.Core/Interfaces/GUI/IGUIToolkit.cs
+++ b/LongoMatch.Core/Interfaces/GUI/IGUIToolkit.cs
@@ -19,15 +19,15 @@ using System;
 using Gtk;
 using System.Collections.Generic;
 
-using LongoMatch.Interfaces;
-using LongoMatch.Common;
-using LongoMatch.Store;
-using LongoMatch.Store.Playlists;
-using Image = LongoMatch.Common.Image;
-using LongoMatch.Stats;
-using LongoMatch.Interfaces.Multimedia;
+using LongoMatch.Core.Interfaces;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Store.Playlists;
+using Image = LongoMatch.Core.Common.Image;
+using LongoMatch.Core.Stats;
+using LongoMatch.Core.Interfaces.Multimedia;
 
-namespace LongoMatch.Interfaces.GUI
+namespace LongoMatch.Core.Interfaces.GUI
 {
        public interface IGUIToolkit
        {
diff --git a/LongoMatch.Core/Interfaces/GUI/IMainController.cs 
b/LongoMatch.Core/Interfaces/GUI/IMainController.cs
index 8ce8942..bdceb79 100644
--- a/LongoMatch.Core/Interfaces/GUI/IMainController.cs
+++ b/LongoMatch.Core/Interfaces/GUI/IMainController.cs
@@ -16,10 +16,10 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 using System;
-using LongoMatch.Handlers;
-using LongoMatch.Store;
+using LongoMatch.Core.Handlers;
+using LongoMatch.Core.Store;
 
-namespace LongoMatch.Interfaces.GUI
+namespace LongoMatch.Core.Interfaces.GUI
 {
        public interface IMainController
        {
diff --git a/LongoMatch.Core/Interfaces/GUI/IPanel.cs b/LongoMatch.Core/Interfaces/GUI/IPanel.cs
index bc3763d..75e699e 100644
--- a/LongoMatch.Core/Interfaces/GUI/IPanel.cs
+++ b/LongoMatch.Core/Interfaces/GUI/IPanel.cs
@@ -16,9 +16,9 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 using System;
-using LongoMatch.Handlers;
+using LongoMatch.Core.Handlers;
 
-namespace LongoMatch.Interfaces.GUI
+namespace LongoMatch.Core.Interfaces.GUI
 {
        public interface IPanel
        {
diff --git a/LongoMatch.Core/Interfaces/GUI/IPlayerBin.cs b/LongoMatch.Core/Interfaces/GUI/IPlayerBin.cs
index eb8a544..c89486e 100644
--- a/LongoMatch.Core/Interfaces/GUI/IPlayerBin.cs
+++ b/LongoMatch.Core/Interfaces/GUI/IPlayerBin.cs
@@ -16,12 +16,12 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 // 
 using System;
-using LongoMatch.Common;
-using LongoMatch.Handlers;
-using LongoMatch.Store;
-using LongoMatch.Store.Playlists;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Handlers;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Store.Playlists;
 
-namespace LongoMatch.Interfaces.GUI
+namespace LongoMatch.Core.Interfaces.GUI
 {
        public interface IPlayerBin
        {
diff --git a/LongoMatch.Core/Interfaces/GUI/IRenderingStateBar.cs 
b/LongoMatch.Core/Interfaces/GUI/IRenderingStateBar.cs
index 23dcec3..28c7daa 100644
--- a/LongoMatch.Core/Interfaces/GUI/IRenderingStateBar.cs
+++ b/LongoMatch.Core/Interfaces/GUI/IRenderingStateBar.cs
@@ -17,7 +17,7 @@
 // 
 using System;
 
-namespace LongoMatch.Interfaces.GUI
+namespace LongoMatch.Core.Interfaces.GUI
 {
        public interface IRenderingStateBar
        {
diff --git a/LongoMatch.Core/Interfaces/IDataBaseManager.cs b/LongoMatch.Core/Interfaces/IDataBaseManager.cs
index 04bd97c..d07b243 100644
--- a/LongoMatch.Core/Interfaces/IDataBaseManager.cs
+++ b/LongoMatch.Core/Interfaces/IDataBaseManager.cs
@@ -18,7 +18,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace LongoMatch.Interfaces
+namespace LongoMatch.Core.Interfaces
 {
        public interface IDataBaseManager
        {
diff --git a/LongoMatch.Core/Interfaces/IDatabase.cs b/LongoMatch.Core/Interfaces/IDatabase.cs
index 4773545..b172fe2 100644
--- a/LongoMatch.Core/Interfaces/IDatabase.cs
+++ b/LongoMatch.Core/Interfaces/IDatabase.cs
@@ -17,9 +17,9 @@
 // 
 using System;
 using System.Collections.Generic;
-using LongoMatch.Store;
+using LongoMatch.Core.Store;
 
-namespace LongoMatch.Interfaces
+namespace LongoMatch.Core.Interfaces
 {
        public interface IDatabase
        {
diff --git a/LongoMatch.Core/Interfaces/IIDObject.cs b/LongoMatch.Core/Interfaces/IIDObject.cs
index 101e76f..876f9ba 100644
--- a/LongoMatch.Core/Interfaces/IIDObject.cs
+++ b/LongoMatch.Core/Interfaces/IIDObject.cs
@@ -17,7 +17,7 @@
 //
 using System;
 
-namespace LongoMatch.Interfaces
+namespace LongoMatch.Core.Interfaces
 {
        public interface IIDObject
        {
diff --git a/LongoMatch.Core/Interfaces/IPlaylistElement.cs b/LongoMatch.Core/Interfaces/IPlaylistElement.cs
index 4698d50..cc6c079 100644
--- a/LongoMatch.Core/Interfaces/IPlaylistElement.cs
+++ b/LongoMatch.Core/Interfaces/IPlaylistElement.cs
@@ -15,9 +15,9 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
-using LongoMatch.Common;
+using LongoMatch.Core.Common;
 
-namespace LongoMatch.Interfaces
+namespace LongoMatch.Core.Interfaces
 {
        public interface IPlaylistElement
        {
diff --git a/LongoMatch.Core/Interfaces/IProjectsImporter.cs b/LongoMatch.Core/Interfaces/IProjectsImporter.cs
index 061a0c3..0f9d7bc 100644
--- a/LongoMatch.Core/Interfaces/IProjectsImporter.cs
+++ b/LongoMatch.Core/Interfaces/IProjectsImporter.cs
@@ -16,9 +16,9 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 using System;
-using LongoMatch.Store;
+using LongoMatch.Core.Store;
 
-namespace LongoMatch.Interfaces
+namespace LongoMatch.Core.Interfaces
 {
        public interface IProjectsImporter
        {
diff --git a/LongoMatch.Core/Interfaces/IRenderingJobsManager.cs 
b/LongoMatch.Core/Interfaces/IRenderingJobsManager.cs
index e639b35..829f2b4 100644
--- a/LongoMatch.Core/Interfaces/IRenderingJobsManager.cs
+++ b/LongoMatch.Core/Interfaces/IRenderingJobsManager.cs
@@ -17,9 +17,9 @@
 // 
 using System;
 using System.Collections.Generic;
-using LongoMatch.Common;
+using LongoMatch.Core.Common;
 
-namespace LongoMatch.Interfaces
+namespace LongoMatch.Core.Interfaces
 {
        public interface IRenderingJobsManager
        {
diff --git a/LongoMatch.Core/Interfaces/ITemplates.cs b/LongoMatch.Core/Interfaces/ITemplates.cs
index 18f36bb..50a8f81 100644
--- a/LongoMatch.Core/Interfaces/ITemplates.cs
+++ b/LongoMatch.Core/Interfaces/ITemplates.cs
@@ -17,10 +17,10 @@
 // 
 using System;
 using System.Collections.Generic;
-using LongoMatch.Store;
-using LongoMatch.Store.Templates;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Store.Templates;
        
-namespace LongoMatch.Interfaces
+namespace LongoMatch.Core.Interfaces
 {
        public interface ITemplate: IIDObject
        {
diff --git a/LongoMatch.Core/Interfaces/ITemplatesService.cs b/LongoMatch.Core/Interfaces/ITemplatesService.cs
index a8aecc6..4d3bf15 100644
--- a/LongoMatch.Core/Interfaces/ITemplatesService.cs
+++ b/LongoMatch.Core/Interfaces/ITemplatesService.cs
@@ -17,10 +17,10 @@
 // 
 using System;
 using System.Collections.Generic;
-using LongoMatch.Store;
-using LongoMatch.Store.Templates;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Store.Templates;
 
-namespace LongoMatch.Interfaces
+namespace LongoMatch.Core.Interfaces
 {
        public interface ITemplatesService
        {
diff --git a/LongoMatch.Core/Interfaces/Multimedia/ICapturer.cs 
b/LongoMatch.Core/Interfaces/Multimedia/ICapturer.cs
index 892f70c..70ebd80 100644
--- a/LongoMatch.Core/Interfaces/Multimedia/ICapturer.cs
+++ b/LongoMatch.Core/Interfaces/Multimedia/ICapturer.cs
@@ -19,12 +19,12 @@
 //
 
 using System;
-using LongoMatch.Common;
-using LongoMatch.Store;
-using Image = LongoMatch.Common.Image;
-using LongoMatch.Handlers;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Store;
+using Image = LongoMatch.Core.Common.Image;
+using LongoMatch.Core.Handlers;
 
-namespace LongoMatch.Interfaces.Multimedia
+namespace LongoMatch.Core.Interfaces.Multimedia
 {
 
 
diff --git a/LongoMatch.Core/Interfaces/Multimedia/IDiscoverer.cs 
b/LongoMatch.Core/Interfaces/Multimedia/IDiscoverer.cs
index 5ca2ac1..cc19253 100644
--- a/LongoMatch.Core/Interfaces/Multimedia/IDiscoverer.cs
+++ b/LongoMatch.Core/Interfaces/Multimedia/IDiscoverer.cs
@@ -16,9 +16,9 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 using System;
-using LongoMatch.Store;
+using LongoMatch.Core.Store;
 
-namespace LongoMatch.Interfaces.Multimedia
+namespace LongoMatch.Core.Interfaces.Multimedia
 {
        public interface IDiscoverer
        {
diff --git a/LongoMatch.Core/Interfaces/Multimedia/IFramesCapturer.cs 
b/LongoMatch.Core/Interfaces/Multimedia/IFramesCapturer.cs
index 98eb8f1..0515d4f 100644
--- a/LongoMatch.Core/Interfaces/Multimedia/IFramesCapturer.cs
+++ b/LongoMatch.Core/Interfaces/Multimedia/IFramesCapturer.cs
@@ -20,10 +20,10 @@
 
 using System;
 
-using LongoMatch.Common;
-using LongoMatch.Store;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Store;
 
-namespace LongoMatch.Interfaces.Multimedia
+namespace LongoMatch.Core.Interfaces.Multimedia
 {
 
 
diff --git a/LongoMatch.Core/Interfaces/Multimedia/IMultimediaToolkit.cs 
b/LongoMatch.Core/Interfaces/Multimedia/IMultimediaToolkit.cs
index 01da02b..ccda512 100644
--- a/LongoMatch.Core/Interfaces/Multimedia/IMultimediaToolkit.cs
+++ b/LongoMatch.Core/Interfaces/Multimedia/IMultimediaToolkit.cs
@@ -18,10 +18,10 @@
 using System;
 using System.Collections.Generic;
 
-using LongoMatch.Common;
-using LongoMatch.Store;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Store;
 
-namespace LongoMatch.Interfaces.Multimedia
+namespace LongoMatch.Core.Interfaces.Multimedia
 {
        public interface IMultimediaToolkit
        {
diff --git a/LongoMatch.Core/Interfaces/Multimedia/IPlayer.cs 
b/LongoMatch.Core/Interfaces/Multimedia/IPlayer.cs
index 44428c3..9c30550 100644
--- a/LongoMatch.Core/Interfaces/Multimedia/IPlayer.cs
+++ b/LongoMatch.Core/Interfaces/Multimedia/IPlayer.cs
@@ -19,12 +19,12 @@
 //
 
 using System;
-using LongoMatch.Store;
-using LongoMatch.Handlers;
-using Image = LongoMatch.Common.Image;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Handlers;
+using Image = LongoMatch.Core.Common.Image;
 
 
-namespace LongoMatch.Interfaces.Multimedia
+namespace LongoMatch.Core.Interfaces.Multimedia
 {
        public interface IPlayer: IDisposable
        {
diff --git a/LongoMatch.Core/Interfaces/Multimedia/IRemuxer.cs 
b/LongoMatch.Core/Interfaces/Multimedia/IRemuxer.cs
index 7bce6dd..f074b46 100644
--- a/LongoMatch.Core/Interfaces/Multimedia/IRemuxer.cs
+++ b/LongoMatch.Core/Interfaces/Multimedia/IRemuxer.cs
@@ -16,9 +16,9 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 // 
 using System;
-using LongoMatch.Handlers;
+using LongoMatch.Core.Handlers;
 
-namespace LongoMatch.Interfaces.Multimedia
+namespace LongoMatch.Core.Interfaces.Multimedia
 {
        public interface IRemuxer
        {
diff --git a/LongoMatch.Core/Interfaces/Multimedia/IVideoConverter.cs 
b/LongoMatch.Core/Interfaces/Multimedia/IVideoConverter.cs
index fb7abdb..a86b1d0 100644
--- a/LongoMatch.Core/Interfaces/Multimedia/IVideoConverter.cs
+++ b/LongoMatch.Core/Interfaces/Multimedia/IVideoConverter.cs
@@ -21,10 +21,10 @@
 using System;
 using Gdk;
 
-using LongoMatch.Common;
-using LongoMatch.Handlers;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Handlers;
 
-namespace LongoMatch.Interfaces.Multimedia
+namespace LongoMatch.Core.Interfaces.Multimedia
 {
 
 
diff --git a/LongoMatch.Core/Interfaces/Multimedia/IVideoEditor.cs 
b/LongoMatch.Core/Interfaces/Multimedia/IVideoEditor.cs
index d830aae..c8e952b 100644
--- a/LongoMatch.Core/Interfaces/Multimedia/IVideoEditor.cs
+++ b/LongoMatch.Core/Interfaces/Multimedia/IVideoEditor.cs
@@ -20,10 +20,10 @@
 
 using System;
 using System.Collections.Generic;
-using LongoMatch.Common;
-using LongoMatch.Handlers;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Handlers;
 
-namespace LongoMatch.Interfaces.Multimedia
+namespace LongoMatch.Core.Interfaces.Multimedia
 {
 
        public interface IVideoEditor
diff --git a/LongoMatch.Core/Makefile.am b/LongoMatch.Core/Makefile.am
index 6c5b659..1b2fdbe 100644
--- a/LongoMatch.Core/Makefile.am
+++ b/LongoMatch.Core/Makefile.am
@@ -76,7 +76,6 @@ SOURCES = Common/Area.cs \
        Store/Drawables/Rectangle.cs \
        Store/Drawables/Selection.cs \
        Store/Drawables/Text.cs \
-       Store/Event.cs \
        Store/EventType.cs \
        Store/FrameDrawing.cs \
        Store/HotKey.cs \
@@ -98,6 +97,7 @@ SOURCES = Common/Area.cs \
        Store/Templates/TeamTemplate.cs \
        Store/Time.cs \
        Store/TimeNode.cs \
+       Store/TimelineEvent.cs \
        Store/TimelineNode.cs \
        Store/Timer.cs \
        StyleConf.cs
diff --git a/LongoMatch.Core/Stats/CategoryStats.cs b/LongoMatch.Core/Stats/CategoryStats.cs
index 6abf1d3..bd4d608 100644
--- a/LongoMatch.Core/Stats/CategoryStats.cs
+++ b/LongoMatch.Core/Stats/CategoryStats.cs
@@ -18,11 +18,11 @@
 using System;
 using System.Collections.Generic;
 
-using LongoMatch.Interfaces;
-using LongoMatch.Store;
-using LongoMatch.Common;
+using LongoMatch.Core.Interfaces;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Common;
 
-namespace LongoMatch.Stats
+namespace LongoMatch.Core.Stats
 {
        public class CategoryStats: Stat
        {
diff --git a/LongoMatch.Core/Stats/PercentualStat.cs b/LongoMatch.Core/Stats/PercentualStat.cs
index 0a0f44e..6e65540 100644
--- a/LongoMatch.Core/Stats/PercentualStat.cs
+++ b/LongoMatch.Core/Stats/PercentualStat.cs
@@ -19,7 +19,7 @@ using System;
 using System.Collections.Generic;
 
 
-namespace LongoMatch.Stats
+namespace LongoMatch.Core.Stats
 {
        public class PercentualStat: Stat
        {
diff --git a/LongoMatch.Core/Stats/PlayersStats.cs b/LongoMatch.Core/Stats/PlayersStats.cs
index 5be1fc5..3e950a6 100644
--- a/LongoMatch.Core/Stats/PlayersStats.cs
+++ b/LongoMatch.Core/Stats/PlayersStats.cs
@@ -18,9 +18,9 @@
 using System;
 using System.Collections.Generic;
 
-using LongoMatch.Store;
+using LongoMatch.Core.Store;
 
-namespace LongoMatch.Stats
+namespace LongoMatch.Core.Stats
 {
        public class PlayersStats
        {
diff --git a/LongoMatch.Core/Stats/ProjectStats.cs b/LongoMatch.Core/Stats/ProjectStats.cs
index 0427daa..350ab3e 100644
--- a/LongoMatch.Core/Stats/ProjectStats.cs
+++ b/LongoMatch.Core/Stats/ProjectStats.cs
@@ -19,12 +19,12 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-using LongoMatch.Common;
-using LongoMatch.Interfaces;
-using LongoMatch.Store;
-using LongoMatch.Store.Templates;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Interfaces;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Store.Templates;
 
-namespace LongoMatch.Stats
+namespace LongoMatch.Core.Stats
 {
        public class ProjectStats: IDisposable
        {
diff --git a/LongoMatch.Core/Stats/Stat.cs b/LongoMatch.Core/Stats/Stat.cs
index 6c9df44..4538b8c 100644
--- a/LongoMatch.Core/Stats/Stat.cs
+++ b/LongoMatch.Core/Stats/Stat.cs
@@ -17,7 +17,7 @@
 // 
 using System;
 
-namespace LongoMatch.Stats
+namespace LongoMatch.Core.Stats
 {
        public class Stat
        {
diff --git a/LongoMatch.Core/Stats/SubCategoryStat.cs b/LongoMatch.Core/Stats/SubCategoryStat.cs
index 642f615..afc94c7 100644
--- a/LongoMatch.Core/Stats/SubCategoryStat.cs
+++ b/LongoMatch.Core/Stats/SubCategoryStat.cs
@@ -18,11 +18,11 @@
 using System;
 using System.Collections.Generic;
 
-using LongoMatch.Common;
-using LongoMatch.Interfaces;
-using LongoMatch.Store;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Interfaces;
+using LongoMatch.Core.Store;
 
-namespace LongoMatch.Stats
+namespace LongoMatch.Core.Stats
 {
        public class SubCategoryStat
        {
diff --git a/LongoMatch.Core/Store/Coordinates.cs b/LongoMatch.Core/Store/Coordinates.cs
index 7b9f215..e263979 100644
--- a/LongoMatch.Core/Store/Coordinates.cs
+++ b/LongoMatch.Core/Store/Coordinates.cs
@@ -18,7 +18,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace LongoMatch.Common
+namespace LongoMatch.Core.Common
 {
        [Serializable]
        public class Coordinates
diff --git a/LongoMatch.Core/Store/DashboardButton.cs b/LongoMatch.Core/Store/DashboardButton.cs
index e89d300..050c7c6 100644
--- a/LongoMatch.Core/Store/DashboardButton.cs
+++ b/LongoMatch.Core/Store/DashboardButton.cs
@@ -16,10 +16,10 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 using System;
-using LongoMatch.Common;
+using LongoMatch.Core.Common;
 using Newtonsoft.Json;
 
-namespace LongoMatch.Store
+namespace LongoMatch.Core.Store
 {
        [Serializable]
        public class DashboardButton
diff --git a/LongoMatch.Core/Store/Drawables/Angle.cs b/LongoMatch.Core/Store/Drawables/Angle.cs
index 08128a6..d91765b 100644
--- a/LongoMatch.Core/Store/Drawables/Angle.cs
+++ b/LongoMatch.Core/Store/Drawables/Angle.cs
@@ -17,9 +17,9 @@
 //
 using System;
 using Newtonsoft.Json;
-using LongoMatch.Common;
+using LongoMatch.Core.Common;
 
-namespace LongoMatch.Store.Drawables
+namespace LongoMatch.Core.Store.Drawables
 {
        [Serializable]
        public class Angle: Drawable
diff --git a/LongoMatch.Core/Store/Drawables/Counter.cs b/LongoMatch.Core/Store/Drawables/Counter.cs
index 01c7e4b..3799d0f 100644
--- a/LongoMatch.Core/Store/Drawables/Counter.cs
+++ b/LongoMatch.Core/Store/Drawables/Counter.cs
@@ -16,9 +16,9 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 using System;
-using LongoMatch.Common;
+using LongoMatch.Core.Common;
 
-namespace LongoMatch.Store.Drawables
+namespace LongoMatch.Core.Store.Drawables
 {
        [Serializable]
        public class Counter: Ellipse
diff --git a/LongoMatch.Core/Store/Drawables/Cross.cs b/LongoMatch.Core/Store/Drawables/Cross.cs
index 5f7b24e..ef3787e 100644
--- a/LongoMatch.Core/Store/Drawables/Cross.cs
+++ b/LongoMatch.Core/Store/Drawables/Cross.cs
@@ -18,9 +18,9 @@
 using System;
 using System.Linq;
 using Newtonsoft.Json;
-using LongoMatch.Common;
+using LongoMatch.Core.Common;
 
-namespace LongoMatch.Store.Drawables
+namespace LongoMatch.Core.Store.Drawables
 {
        [Serializable]
        public class Cross: Drawable
diff --git a/LongoMatch.Core/Store/Drawables/Drawable.cs b/LongoMatch.Core/Store/Drawables/Drawable.cs
index 40b1845..22c895a 100644
--- a/LongoMatch.Core/Store/Drawables/Drawable.cs
+++ b/LongoMatch.Core/Store/Drawables/Drawable.cs
@@ -17,10 +17,10 @@
 //
 using System;
 
-using LongoMatch.Common;
-using LongoMatch.Interfaces.Drawing;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Interfaces.Drawing;
 
-namespace LongoMatch.Store.Drawables
+namespace LongoMatch.Core.Store.Drawables
 {
        [Serializable]
        public abstract class Drawable: IBlackboardObject
diff --git a/LongoMatch.Core/Store/Drawables/Ellipse.cs b/LongoMatch.Core/Store/Drawables/Ellipse.cs
index a0a0ad2..76ceefa 100644
--- a/LongoMatch.Core/Store/Drawables/Ellipse.cs
+++ b/LongoMatch.Core/Store/Drawables/Ellipse.cs
@@ -17,9 +17,9 @@
 //
 using System;
 using Newtonsoft.Json;
-using LongoMatch.Common;
+using LongoMatch.Core.Common;
 
-namespace LongoMatch.Store.Drawables
+namespace LongoMatch.Core.Store.Drawables
 {
        [Serializable]
        public class Ellipse: Drawable
diff --git a/LongoMatch.Core/Store/Drawables/Line.cs b/LongoMatch.Core/Store/Drawables/Line.cs
index 88862a2..5ce4831 100644
--- a/LongoMatch.Core/Store/Drawables/Line.cs
+++ b/LongoMatch.Core/Store/Drawables/Line.cs
@@ -16,10 +16,10 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 using System;
-using LongoMatch.Common;
+using LongoMatch.Core.Common;
 using Newtonsoft.Json;
 
-namespace LongoMatch.Store.Drawables
+namespace LongoMatch.Core.Store.Drawables
 {
        [Serializable]
        public class Line: Drawable
diff --git a/LongoMatch.Core/Store/Drawables/MultiPoints.cs b/LongoMatch.Core/Store/Drawables/MultiPoints.cs
index d2deac1..03fe5db 100644
--- a/LongoMatch.Core/Store/Drawables/MultiPoints.cs
+++ b/LongoMatch.Core/Store/Drawables/MultiPoints.cs
@@ -18,9 +18,9 @@
 using System;
 using System.Linq;
 using System.Collections.Generic;
-using LongoMatch.Common;
+using LongoMatch.Core.Common;
 
-namespace LongoMatch.Store.Drawables
+namespace LongoMatch.Core.Store.Drawables
 {
        public class MultiPoints: Rectangle
        {
diff --git a/LongoMatch.Core/Store/Drawables/Quadrilateral.cs 
b/LongoMatch.Core/Store/Drawables/Quadrilateral.cs
index c50a8ac..90c9695 100644
--- a/LongoMatch.Core/Store/Drawables/Quadrilateral.cs
+++ b/LongoMatch.Core/Store/Drawables/Quadrilateral.cs
@@ -16,9 +16,9 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 using System;
-using LongoMatch.Common;
+using LongoMatch.Core.Common;
 
-namespace LongoMatch.Store.Drawables
+namespace LongoMatch.Core.Store.Drawables
 {
        [Serializable]
        public class Quadrilateral: Drawable
diff --git a/LongoMatch.Core/Store/Drawables/Rectangle.cs b/LongoMatch.Core/Store/Drawables/Rectangle.cs
index 6c9d08a..70fc287 100644
--- a/LongoMatch.Core/Store/Drawables/Rectangle.cs
+++ b/LongoMatch.Core/Store/Drawables/Rectangle.cs
@@ -17,10 +17,10 @@
 //
 using System;
 using System.Linq;
-using LongoMatch.Common;
+using LongoMatch.Core.Common;
 using Newtonsoft.Json;
 
-namespace LongoMatch.Store.Drawables
+namespace LongoMatch.Core.Store.Drawables
 {
        [Serializable]
        public class Rectangle: Quadrilateral
diff --git a/LongoMatch.Core/Store/Drawables/Selection.cs b/LongoMatch.Core/Store/Drawables/Selection.cs
index f45ce42..8e45cec 100644
--- a/LongoMatch.Core/Store/Drawables/Selection.cs
+++ b/LongoMatch.Core/Store/Drawables/Selection.cs
@@ -16,10 +16,10 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 using System;
-using LongoMatch.Common;
-using LongoMatch.Interfaces.Drawing;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Interfaces.Drawing;
 
-namespace LongoMatch.Store.Drawables
+namespace LongoMatch.Core.Store.Drawables
 {
        [Serializable]
        public class Selection
diff --git a/LongoMatch.Core/Store/Drawables/Text.cs b/LongoMatch.Core/Store/Drawables/Text.cs
index f39896d..2403f6a 100644
--- a/LongoMatch.Core/Store/Drawables/Text.cs
+++ b/LongoMatch.Core/Store/Drawables/Text.cs
@@ -16,9 +16,9 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 using System;
-using LongoMatch.Common;
+using LongoMatch.Core.Common;
 
-namespace LongoMatch.Store.Drawables
+namespace LongoMatch.Core.Store.Drawables
 {
        [Serializable]
        public class Text: Rectangle
diff --git a/LongoMatch.Core/Store/EventType.cs b/LongoMatch.Core/Store/EventType.cs
index e73a4c9..36b36cc 100644
--- a/LongoMatch.Core/Store/EventType.cs
+++ b/LongoMatch.Core/Store/EventType.cs
@@ -17,11 +17,11 @@
 //
 using System;
 using System.Collections.Generic;
-using LongoMatch.Common;
+using LongoMatch.Core.Common;
 using Mono.Unix;
 using Newtonsoft.Json;
 
-namespace LongoMatch.Store
+namespace LongoMatch.Core.Store
 {
        [Serializable]
        public class EventType
diff --git a/LongoMatch.Core/Store/FrameDrawing.cs b/LongoMatch.Core/Store/FrameDrawing.cs
index 90d17f8..e22d445 100644
--- a/LongoMatch.Core/Store/FrameDrawing.cs
+++ b/LongoMatch.Core/Store/FrameDrawing.cs
@@ -19,11 +19,11 @@
 using System;
 using Newtonsoft.Json;
 
-using LongoMatch.Common;
+using LongoMatch.Core.Common;
 using System.Collections.Generic;
-using LongoMatch.Store.Drawables;
+using LongoMatch.Core.Store.Drawables;
 
-namespace LongoMatch.Store
+namespace LongoMatch.Core.Store
 {
 
        [Serializable]
diff --git a/LongoMatch.Core/Store/HotKey.cs b/LongoMatch.Core/Store/HotKey.cs
index 44db021..9dbe918 100644
--- a/LongoMatch.Core/Store/HotKey.cs
+++ b/LongoMatch.Core/Store/HotKey.cs
@@ -25,14 +25,14 @@ using System.Collections.Generic;
 using System.Runtime.Serialization;
 using Mono.Unix;
 using Newtonsoft.Json;
-using LongoMatch.Common;
+using LongoMatch.Core.Common;
 
 
 #if HAVE_GTK
 using Gdk;
 #endif
 
-namespace LongoMatch.Store
+namespace LongoMatch.Core.Store
 {
 
        /// <summary>
diff --git a/LongoMatch.Core/Store/MediaFile.cs b/LongoMatch.Core/Store/MediaFile.cs
index 3d2d4b1..e1a027a 100644
--- a/LongoMatch.Core/Store/MediaFile.cs
+++ b/LongoMatch.Core/Store/MediaFile.cs
@@ -21,10 +21,10 @@
 using System;
 using Mono.Unix;
 
-using LongoMatch.Common;
+using LongoMatch.Core.Common;
 using Newtonsoft.Json;
 
-namespace LongoMatch.Store
+namespace LongoMatch.Core.Store
 {
 
        [Serializable]
diff --git a/LongoMatch.Core/Store/PenaltyCard.cs b/LongoMatch.Core/Store/PenaltyCard.cs
index 8a993d4..7c62718 100644
--- a/LongoMatch.Core/Store/PenaltyCard.cs
+++ b/LongoMatch.Core/Store/PenaltyCard.cs
@@ -16,9 +16,9 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 using System;
-using LongoMatch.Common;
+using LongoMatch.Core.Common;
 
-namespace LongoMatch.Store
+namespace LongoMatch.Core.Store
 {
        [Serializable]
        public class PenaltyCard
diff --git a/LongoMatch.Core/Store/Period.cs b/LongoMatch.Core/Store/Period.cs
index 8dbfd20..3a4bed5 100644
--- a/LongoMatch.Core/Store/Period.cs
+++ b/LongoMatch.Core/Store/Period.cs
@@ -20,7 +20,7 @@ using System.Linq;
 using System.Collections.Generic;
 using Newtonsoft.Json;
 
-namespace LongoMatch.Store
+namespace LongoMatch.Core.Store
 {
        public class Period: Timer
        {
diff --git a/LongoMatch.Core/Store/PixbufTimeNode.cs b/LongoMatch.Core/Store/PixbufTimeNode.cs
index 6faa2ad..92d55f1 100644
--- a/LongoMatch.Core/Store/PixbufTimeNode.cs
+++ b/LongoMatch.Core/Store/PixbufTimeNode.cs
@@ -21,9 +21,9 @@
 using System;
 using System.IO;
 
-using LongoMatch.Common;
+using LongoMatch.Core.Common;
 
-namespace LongoMatch.Store
+namespace LongoMatch.Core.Store
 {
 
        /// <summary>
diff --git a/LongoMatch.Core/Store/Player.cs b/LongoMatch.Core/Store/Player.cs
index ea7cdfc..5f150cf 100644
--- a/LongoMatch.Core/Store/Player.cs
+++ b/LongoMatch.Core/Store/Player.cs
@@ -17,11 +17,11 @@
 //
 
 using System;
-using LongoMatch.Common;
+using LongoMatch.Core.Common;
 using Newtonsoft.Json;
-using LongoMatch.Interfaces;
+using LongoMatch.Core.Interfaces;
 
-namespace LongoMatch.Store
+namespace LongoMatch.Core.Store
 {
        /// <summary>
        /// Player of a team
diff --git a/LongoMatch.Core/Store/Playlists/Playlist.cs b/LongoMatch.Core/Store/Playlists/Playlist.cs
index 8d77c94..3f3a338 100644
--- a/LongoMatch.Core/Store/Playlists/Playlist.cs
+++ b/LongoMatch.Core/Store/Playlists/Playlist.cs
@@ -19,9 +19,9 @@
 //
 using System;
 using System.Collections.Generic;
-using LongoMatch.Interfaces;
+using LongoMatch.Core.Interfaces;
 
-namespace LongoMatch.Store.Playlists
+namespace LongoMatch.Core.Store.Playlists
 {
        [Serializable]
        public class Playlist
diff --git a/LongoMatch.Core/Store/Playlists/PlaylistDrawing.cs 
b/LongoMatch.Core/Store/Playlists/PlaylistDrawing.cs
index c94b85f..8b17a2f 100644
--- a/LongoMatch.Core/Store/Playlists/PlaylistDrawing.cs
+++ b/LongoMatch.Core/Store/Playlists/PlaylistDrawing.cs
@@ -16,10 +16,10 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 using System;
-using LongoMatch.Interfaces;
-using LongoMatch.Common;
+using LongoMatch.Core.Interfaces;
+using LongoMatch.Core.Common;
 
-namespace LongoMatch.Store.Playlists
+namespace LongoMatch.Core.Store.Playlists
 {
        [Serializable]
        public class PlaylistDrawing: IPlaylistElement
diff --git a/LongoMatch.Core/Store/Playlists/PlaylistImage.cs 
b/LongoMatch.Core/Store/Playlists/PlaylistImage.cs
index 21543df..9ca89e6 100644
--- a/LongoMatch.Core/Store/Playlists/PlaylistImage.cs
+++ b/LongoMatch.Core/Store/Playlists/PlaylistImage.cs
@@ -16,14 +16,14 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 using System;
-using LongoMatch.Common;
-using LongoMatch.Interfaces;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Interfaces;
 
 #if HAVE_GTK
 using SImage = Gdk.Pixbuf;
 #endif
 
-namespace LongoMatch.Store.Playlists
+namespace LongoMatch.Core.Store.Playlists
 {
        [Serializable]
        public class PlaylistImage: IPlaylistElement
diff --git a/LongoMatch.Core/Store/Playlists/PlaylistPlayElement.cs 
b/LongoMatch.Core/Store/Playlists/PlaylistPlayElement.cs
index 188b2e4..66adaae 100644
--- a/LongoMatch.Core/Store/Playlists/PlaylistPlayElement.cs
+++ b/LongoMatch.Core/Store/Playlists/PlaylistPlayElement.cs
@@ -17,10 +17,10 @@
 //
 using System;
 using Newtonsoft.Json;
-using LongoMatch.Common;
-using LongoMatch.Interfaces;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Interfaces;
 
-namespace LongoMatch.Store.Playlists
+namespace LongoMatch.Core.Store.Playlists
 {
        [Serializable]
        public class PlaylistPlayElement: IPlaylistElement
diff --git a/LongoMatch.Core/Store/Point.cs b/LongoMatch.Core/Store/Point.cs
index 2e8c082..4ffbcf5 100644
--- a/LongoMatch.Core/Store/Point.cs
+++ b/LongoMatch.Core/Store/Point.cs
@@ -20,7 +20,7 @@ using System;
 using System.Collections.Generic;
 using Newtonsoft.Json;
 
-namespace LongoMatch.Common
+namespace LongoMatch.Core.Common
 {
        
        [Serializable]
diff --git a/LongoMatch.Core/Store/Project.cs b/LongoMatch.Core/Store/Project.cs
index 4ed46c0..2825c01 100644
--- a/LongoMatch.Core/Store/Project.cs
+++ b/LongoMatch.Core/Store/Project.cs
@@ -25,13 +25,13 @@ using System.Linq;
 using Newtonsoft.Json;
 using Mono.Unix;
 
-using LongoMatch.Common;
-using LongoMatch.Interfaces;
-using LongoMatch.Store;
-using LongoMatch.Store.Playlists;
-using LongoMatch.Store.Templates;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Interfaces;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Store.Playlists;
+using LongoMatch.Core.Store.Templates;
 
-namespace LongoMatch.Store
+namespace LongoMatch.Core.Store
 {
 
        /// <summary>
diff --git a/LongoMatch.Core/Store/ProjectDescription.cs b/LongoMatch.Core/Store/ProjectDescription.cs
index 68f0deb..144bbb9 100644
--- a/LongoMatch.Core/Store/ProjectDescription.cs
+++ b/LongoMatch.Core/Store/ProjectDescription.cs
@@ -18,10 +18,10 @@
 
 using System;
 using Newtonsoft.Json;
-using LongoMatch.Store;
-using LongoMatch.Interfaces;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Interfaces;
 
-namespace LongoMatch.Store
+namespace LongoMatch.Core.Store
 {
 
        /// <summary>
diff --git a/LongoMatch.Core/Store/Score.cs b/LongoMatch.Core/Store/Score.cs
index 6bb7d81..0e44506 100644
--- a/LongoMatch.Core/Store/Score.cs
+++ b/LongoMatch.Core/Store/Score.cs
@@ -17,7 +17,7 @@
 //
 using System;
 
-namespace LongoMatch.Store
+namespace LongoMatch.Core.Store
 {
        [Serializable]
        public class Score
diff --git a/LongoMatch.Core/Store/Tag.cs b/LongoMatch.Core/Store/Tag.cs
index 2b0cf3f..3a5a21b 100644
--- a/LongoMatch.Core/Store/Tag.cs
+++ b/LongoMatch.Core/Store/Tag.cs
@@ -20,10 +20,10 @@ using System;
 using System.Linq;
 using System.Collections.Generic;
 
-using LongoMatch.Common;
-using LongoMatch.Interfaces;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Interfaces;
 
-namespace LongoMatch.Store
+namespace LongoMatch.Core.Store
 {
 
        [Serializable]
diff --git a/LongoMatch.Core/Store/Templates/Dashboard.cs b/LongoMatch.Core/Store/Templates/Dashboard.cs
index fb07978..d0a7da8 100644
--- a/LongoMatch.Core/Store/Templates/Dashboard.cs
+++ b/LongoMatch.Core/Store/Templates/Dashboard.cs
@@ -23,13 +23,13 @@ using System.Linq;
 using Newtonsoft.Json;
 
 using Mono.Unix;
-using LongoMatch.Common;
-using LongoMatch.Interfaces;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Interfaces;
 
-using Image = LongoMatch.Common.Image;
+using Image = LongoMatch.Core.Common.Image;
 using System.Collections.ObjectModel;
 
-namespace LongoMatch.Store.Templates
+namespace LongoMatch.Core.Store.Templates
 {
 
        /// <summary>
diff --git a/LongoMatch.Core/Store/Templates/TeamTemplate.cs b/LongoMatch.Core/Store/Templates/TeamTemplate.cs
index 6d3070d..fd702ea 100644
--- a/LongoMatch.Core/Store/Templates/TeamTemplate.cs
+++ b/LongoMatch.Core/Store/Templates/TeamTemplate.cs
@@ -22,10 +22,10 @@ using System.Linq;
 using Mono.Unix;
 using Newtonsoft.Json;
 
-using LongoMatch.Common;
-using LongoMatch.Interfaces;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Interfaces;
 
-namespace LongoMatch.Store.Templates
+namespace LongoMatch.Core.Store.Templates
 {
        [Serializable]
        public class TeamTemplate: ITemplate
diff --git a/LongoMatch.Core/Store/Time.cs b/LongoMatch.Core/Store/Time.cs
index 10d17dc..e2710f4 100644
--- a/LongoMatch.Core/Store/Time.cs
+++ b/LongoMatch.Core/Store/Time.cs
@@ -20,9 +20,9 @@
 
 using System;
 using Newtonsoft.Json;
-using LongoMatch.Common;
+using LongoMatch.Core.Common;
 
-namespace LongoMatch.Store
+namespace LongoMatch.Core.Store
 {
 
        /// <summary>
diff --git a/LongoMatch.Core/Store/TimeNode.cs b/LongoMatch.Core/Store/TimeNode.cs
index 36267f9..9dabe55 100644
--- a/LongoMatch.Core/Store/TimeNode.cs
+++ b/LongoMatch.Core/Store/TimeNode.cs
@@ -21,9 +21,9 @@
 using System;
 using System.Collections.Generic;
 using Newtonsoft.Json;
-using LongoMatch.Store;
+using LongoMatch.Core.Store;
 
-namespace LongoMatch.Store
+namespace LongoMatch.Core.Store
 {
 
        /// <summary>
diff --git a/LongoMatch.Core/Store/TimelineEvent.cs b/LongoMatch.Core/Store/TimelineEvent.cs
index 056539a..cc7b277 100644
--- a/LongoMatch.Core/Store/TimelineEvent.cs
+++ b/LongoMatch.Core/Store/TimelineEvent.cs
@@ -22,8 +22,8 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Mono.Unix;
-using LongoMatch.LongoMatch.Core.Common;
-using LongoMatch.LongoMatch.Core.Interfaces;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Interfaces;
 using Newtonsoft.Json;
 
 namespace LongoMatch.Core.Store
diff --git a/LongoMatch.Core/Store/TimelineNode.cs b/LongoMatch.Core/Store/TimelineNode.cs
index 2da229a..11333f1 100644
--- a/LongoMatch.Core/Store/TimelineNode.cs
+++ b/LongoMatch.Core/Store/TimelineNode.cs
@@ -17,9 +17,9 @@
 // 
 using System;
 using Newtonsoft.Json;
-using LongoMatch.Interfaces;
+using LongoMatch.Core.Interfaces;
 
-namespace LongoMatch.Store
+namespace LongoMatch.Core.Store
 {
     /* FIXME: Code duplicated from Play, unfortunately we can't
       * modify the class hierachy */
diff --git a/LongoMatch.Core/Store/Timer.cs b/LongoMatch.Core/Store/Timer.cs
index 455493b..bcd6653 100644
--- a/LongoMatch.Core/Store/Timer.cs
+++ b/LongoMatch.Core/Store/Timer.cs
@@ -17,11 +17,11 @@
 //
 using System;
 using System.Linq;
-using LongoMatch.Store;
+using LongoMatch.Core.Store;
 using System.Collections.Generic;
 using Newtonsoft.Json;
 
-namespace LongoMatch.Store
+namespace LongoMatch.Core.Store
 {
        [Serializable]
        public class Timer
diff --git a/LongoMatch.Core/StyleConf.cs b/LongoMatch.Core/StyleConf.cs
index 71bd282..68714f3 100644
--- a/LongoMatch.Core/StyleConf.cs
+++ b/LongoMatch.Core/StyleConf.cs
@@ -17,7 +17,7 @@
 //
 using System;
 
-namespace LongoMatch.Common
+namespace LongoMatch.Core.Common
 {
        public class StyleConf
        {
diff --git a/LongoMatch.Drawing.Cairo/CairoBackend.cs b/LongoMatch.Drawing.Cairo/CairoBackend.cs
index 2bf7d9d..2bb9487 100644
--- a/LongoMatch.Drawing.Cairo/CairoBackend.cs
+++ b/LongoMatch.Drawing.Cairo/CairoBackend.cs
@@ -17,15 +17,15 @@
 //
 using System;
 using Cairo;
-using LongoMatch.Common;
-using LongoMatch.Interfaces.Drawing;
-using FontSlant = LongoMatch.Common.FontSlant;
-using FontWeight = LongoMatch.Common.FontWeight;
-using FontAlignment = LongoMatch.Common.FontAlignment;
-using Color = LongoMatch.Common.Color;
-using Image = LongoMatch.Common.Image;
-using LineStyle = LongoMatch.Common.LineStyle;
-using Point = LongoMatch.Common.Point;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Interfaces.Drawing;
+using FontSlant = LongoMatch.Core.Common.FontSlant;
+using FontWeight = LongoMatch.Core.Common.FontWeight;
+using FontAlignment = LongoMatch.Core.Common.FontAlignment;
+using Color = LongoMatch.Core.Common.Color;
+using Image = LongoMatch.Core.Common.Image;
+using LineStyle = LongoMatch.Core.Common.LineStyle;
+using Point = LongoMatch.Core.Common.Point;
 using Gdk;
 using Pango;
 
diff --git a/LongoMatch.Drawing.Cairo/CairoContext.cs b/LongoMatch.Drawing.Cairo/CairoContext.cs
index 7559177..5cfcea1 100644
--- a/LongoMatch.Drawing.Cairo/CairoContext.cs
+++ b/LongoMatch.Drawing.Cairo/CairoContext.cs
@@ -17,7 +17,7 @@
 //
 using Gdk;
 using Cairo;
-using LongoMatch.Interfaces.Drawing;
+using LongoMatch.Core.Interfaces.Drawing;
 using Pango;
 
 namespace LongoMatch.Drawing.Cairo
diff --git a/LongoMatch.Drawing.Cairo/Surface.cs b/LongoMatch.Drawing.Cairo/Surface.cs
index c659e72..15d978f 100644
--- a/LongoMatch.Drawing.Cairo/Surface.cs
+++ b/LongoMatch.Drawing.Cairo/Surface.cs
@@ -17,8 +17,8 @@
 //
 using System;
 using Cairo;
-using LongoMatch.Common;
-using LongoMatch.Interfaces.Drawing;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Interfaces.Drawing;
 
 namespace LongoMatch.Drawing.Cairo
 {
diff --git a/LongoMatch.Drawing.Cairo/WidgetWrapper.cs b/LongoMatch.Drawing.Cairo/WidgetWrapper.cs
index 2b41a5f..0dccae5 100644
--- a/LongoMatch.Drawing.Cairo/WidgetWrapper.cs
+++ b/LongoMatch.Drawing.Cairo/WidgetWrapper.cs
@@ -17,12 +17,12 @@
 //
 using Gtk;
 using Gdk;
-using LongoMatch.Common;
-using LongoMatch.Interfaces.Drawing;
-using LongoMatch.Handlers.Drawing;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Interfaces.Drawing;
+using LongoMatch.Core.Handlers.Drawing;
 using Rectangle = Gdk.Rectangle;
-using Point = LongoMatch.Common.Point;
-using CursorType = LongoMatch.Common.CursorType;
+using Point = LongoMatch.Core.Common.Point;
+using CursorType = LongoMatch.Core.Common.CursorType;
 using GCursorType = Gdk.CursorType;
 
 namespace LongoMatch.Drawing.Cairo
@@ -34,7 +34,7 @@ namespace LongoMatch.Drawing.Cairo
                public event ButtonReleasedHandler ButtonReleasedEvent;
                public event MotionHandler MotionEvent;
                public event ShowTooltipHandler ShowTooltipEvent;
-               public event LongoMatch.Handlers.Drawing.SizeChangedHandler SizeChangedEvent;
+               public event LongoMatch.Core.Handlers.Drawing.SizeChangedHandler SizeChangedEvent;
 
                DrawingArea widget;
                int currentWidth, currentHeight;
diff --git a/LongoMatch.Drawing/Canvas.cs b/LongoMatch.Drawing/Canvas.cs
index d52326e..66739d3 100644
--- a/LongoMatch.Drawing/Canvas.cs
+++ b/LongoMatch.Drawing/Canvas.cs
@@ -18,10 +18,10 @@
 using System;
 using System.Linq;
 using System.Collections.Generic;
-using LongoMatch.Interfaces.Drawing;
-using LongoMatch.Interfaces;
-using LongoMatch.Common;
-using LongoMatch.Store.Drawables;
+using LongoMatch.Core.Interfaces.Drawing;
+using LongoMatch.Core.Interfaces;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Store.Drawables;
 using LongoMatch.Drawing.CanvasObjects;
 
 namespace LongoMatch.Drawing
diff --git a/LongoMatch.Drawing/CanvasObjects/BenchObject.cs b/LongoMatch.Drawing/CanvasObjects/BenchObject.cs
index 832bfc1..d8093db 100644
--- a/LongoMatch.Drawing/CanvasObjects/BenchObject.cs
+++ b/LongoMatch.Drawing/CanvasObjects/BenchObject.cs
@@ -16,10 +16,10 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 using System;
-using LongoMatch.Interfaces.Drawing;
-using LongoMatch.Common;
+using LongoMatch.Core.Interfaces.Drawing;
+using LongoMatch.Core.Common;
 using System.Collections.Generic;
-using LongoMatch.Store.Drawables;
+using LongoMatch.Core.Store.Drawables;
 
 namespace LongoMatch.Drawing.CanvasObjects
 {
diff --git a/LongoMatch.Drawing/CanvasObjects/CanvasObject.cs 
b/LongoMatch.Drawing/CanvasObjects/CanvasObject.cs
index 9909688..9a6578d 100644
--- a/LongoMatch.Drawing/CanvasObjects/CanvasObject.cs
+++ b/LongoMatch.Drawing/CanvasObjects/CanvasObject.cs
@@ -15,9 +15,9 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
-using LongoMatch.Interfaces.Drawing;
-using LongoMatch.Common;
-using LongoMatch.Store.Drawables;
+using LongoMatch.Core.Interfaces.Drawing;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Store.Drawables;
 using System;
 
 namespace LongoMatch.Drawing.CanvasObjects
diff --git a/LongoMatch.Drawing/CanvasObjects/CardObject.cs b/LongoMatch.Drawing/CanvasObjects/CardObject.cs
index 038e0f4..4c504fa 100644
--- a/LongoMatch.Drawing/CanvasObjects/CardObject.cs
+++ b/LongoMatch.Drawing/CanvasObjects/CardObject.cs
@@ -16,9 +16,9 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 using System;
-using LongoMatch.Common;
-using LongoMatch.Interfaces.Drawing;
-using LongoMatch.Store;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Interfaces.Drawing;
+using LongoMatch.Core.Store;
 
 namespace LongoMatch.Drawing.CanvasObjects
 {
diff --git a/LongoMatch.Drawing/CanvasObjects/CategoryLabel.cs 
b/LongoMatch.Drawing/CanvasObjects/CategoryLabel.cs
index 483ae07..0634e3a 100644
--- a/LongoMatch.Drawing/CanvasObjects/CategoryLabel.cs
+++ b/LongoMatch.Drawing/CanvasObjects/CategoryLabel.cs
@@ -15,9 +15,9 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
-using LongoMatch.Store;
-using LongoMatch.Interfaces.Drawing;
-using LongoMatch.Common;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Interfaces.Drawing;
+using LongoMatch.Core.Common;
 using System;
 
 namespace LongoMatch.Drawing.CanvasObjects
diff --git a/LongoMatch.Drawing/CanvasObjects/CategoryObject.cs 
b/LongoMatch.Drawing/CanvasObjects/CategoryObject.cs
index 824d11b..27bd1bd 100644
--- a/LongoMatch.Drawing/CanvasObjects/CategoryObject.cs
+++ b/LongoMatch.Drawing/CanvasObjects/CategoryObject.cs
@@ -17,10 +17,10 @@
 //
 using System;
 using System.Collections.Generic;
-using LongoMatch.Common;
-using LongoMatch.Interfaces.Drawing;
-using LongoMatch.Store;
-using LongoMatch.Store.Drawables;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Interfaces.Drawing;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Store.Drawables;
 
 namespace LongoMatch.Drawing.CanvasObjects
 {
@@ -144,13 +144,13 @@ namespace LongoMatch.Drawing.CanvasObjects
                        DrawButton (tk, true);
 
                        /* Draw header */
-                       tk.FillColor = LongoMatch.Common.Color.Grey2;
+                       tk.FillColor = LongoMatch.Core.Common.Color.Grey2;
                        tk.LineWidth = 2;
                        if (catSelected && Mode != TagMode.Edit) {
                                tk.StrokeColor = Button.DarkColor;
                                tk.DrawText (position, catWidth, heightPerRow, Button.EventType.Name);
                        } else {
-                               tk.StrokeColor = LongoMatch.Common.Color.Grey2;
+                               tk.StrokeColor = LongoMatch.Core.Common.Color.Grey2;
                                tk.DrawText (position, catWidth, heightPerRow, Button.EventType.Name);
                        }
                        rects.Add (new Rectangle (position, catWidth, heightPerRow), Button);
diff --git a/LongoMatch.Drawing/CanvasObjects/CounterObject.cs 
b/LongoMatch.Drawing/CanvasObjects/CounterObject.cs
index ab16443..387e39b 100644
--- a/LongoMatch.Drawing/CanvasObjects/CounterObject.cs
+++ b/LongoMatch.Drawing/CanvasObjects/CounterObject.cs
@@ -16,10 +16,10 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 using System;
-using LongoMatch.Store.Drawables;
-using LongoMatch.Interfaces.Drawing;
-using LongoMatch.Interfaces;
-using LongoMatch.Common;
+using LongoMatch.Core.Store.Drawables;
+using LongoMatch.Core.Interfaces.Drawing;
+using LongoMatch.Core.Interfaces;
+using LongoMatch.Core.Common;
 
 namespace LongoMatch.Drawing.CanvasObjects
 {
diff --git a/LongoMatch.Drawing/CanvasObjects/CrossObject.cs b/LongoMatch.Drawing/CanvasObjects/CrossObject.cs
index 7392dbc..038d996 100644
--- a/LongoMatch.Drawing/CanvasObjects/CrossObject.cs
+++ b/LongoMatch.Drawing/CanvasObjects/CrossObject.cs
@@ -16,10 +16,10 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 using System;
-using LongoMatch.Store.Drawables;
-using LongoMatch.Interfaces.Drawing;
-using LongoMatch.Interfaces;
-using LongoMatch.Common;
+using LongoMatch.Core.Store.Drawables;
+using LongoMatch.Core.Interfaces.Drawing;
+using LongoMatch.Core.Interfaces;
+using LongoMatch.Core.Common;
 
 namespace LongoMatch.Drawing.CanvasObjects
 {
diff --git a/LongoMatch.Drawing/CanvasObjects/EllipseObject.cs 
b/LongoMatch.Drawing/CanvasObjects/EllipseObject.cs
index 4ba690c..e4128a5 100644
--- a/LongoMatch.Drawing/CanvasObjects/EllipseObject.cs
+++ b/LongoMatch.Drawing/CanvasObjects/EllipseObject.cs
@@ -16,10 +16,10 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 using System;
-using LongoMatch.Interfaces.Drawing;
-using LongoMatch.Store.Drawables;
-using LongoMatch.Common;
-using LongoMatch.Interfaces;
+using LongoMatch.Core.Interfaces.Drawing;
+using LongoMatch.Core.Store.Drawables;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Interfaces;
 
 namespace LongoMatch.Drawing.CanvasObjects
 {
diff --git a/LongoMatch.Drawing/CanvasObjects/FieldObject.cs b/LongoMatch.Drawing/CanvasObjects/FieldObject.cs
index ff80412..b18ef3e 100644
--- a/LongoMatch.Drawing/CanvasObjects/FieldObject.cs
+++ b/LongoMatch.Drawing/CanvasObjects/FieldObject.cs
@@ -17,10 +17,10 @@
 //
 using System;
 using System.Linq;
-using LongoMatch.Interfaces.Drawing;
+using LongoMatch.Core.Interfaces.Drawing;
 using System.Collections.Generic;
-using LongoMatch.Common;
-using LongoMatch.Store.Drawables;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Store.Drawables;
 
 namespace LongoMatch.Drawing.CanvasObjects
 {
diff --git a/LongoMatch.Drawing/CanvasObjects/LineObject.cs b/LongoMatch.Drawing/CanvasObjects/LineObject.cs
index 1c5cf37..f4f260e 100644
--- a/LongoMatch.Drawing/CanvasObjects/LineObject.cs
+++ b/LongoMatch.Drawing/CanvasObjects/LineObject.cs
@@ -16,10 +16,10 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 using System;
-using LongoMatch.Common;
-using LongoMatch.Store.Drawables;
-using LongoMatch.Interfaces.Drawing;
-using LongoMatch.Interfaces;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Store.Drawables;
+using LongoMatch.Core.Interfaces.Drawing;
+using LongoMatch.Core.Interfaces;
 
 namespace LongoMatch.Drawing.CanvasObjects
 {
diff --git a/LongoMatch.Drawing/CanvasObjects/PlayObject.cs b/LongoMatch.Drawing/CanvasObjects/PlayObject.cs
index 370e3a5..1437a39 100644
--- a/LongoMatch.Drawing/CanvasObjects/PlayObject.cs
+++ b/LongoMatch.Drawing/CanvasObjects/PlayObject.cs
@@ -16,11 +16,11 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 using System;
-using LongoMatch.Store;
-using LongoMatch.Interfaces.Drawing;
-using LongoMatch.Interfaces;
-using LongoMatch.Common;
-using LongoMatch.Store.Drawables;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Interfaces.Drawing;
+using LongoMatch.Core.Interfaces;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Store.Drawables;
 
 namespace LongoMatch.Drawing.CanvasObjects
 {
diff --git a/LongoMatch.Drawing/CanvasObjects/PlayerObject.cs 
b/LongoMatch.Drawing/CanvasObjects/PlayerObject.cs
index f79cfcd..6ca37f0 100644
--- a/LongoMatch.Drawing/CanvasObjects/PlayerObject.cs
+++ b/LongoMatch.Drawing/CanvasObjects/PlayerObject.cs
@@ -16,11 +16,11 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 using System;
-using LongoMatch.Interfaces.Drawing;
-using LongoMatch.Store;
-using LongoMatch.Interfaces;
-using LongoMatch.Common;
-using LongoMatch.Store.Drawables;
+using LongoMatch.Core.Interfaces.Drawing;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Interfaces;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Store.Drawables;
 using LongoMatch.Drawing.Widgets;
 
 namespace LongoMatch.Drawing.CanvasObjects
diff --git a/LongoMatch.Drawing/CanvasObjects/PlayersTaggerObject.cs 
b/LongoMatch.Drawing/CanvasObjects/PlayersTaggerObject.cs
index ac5a6fa..1761776 100644
--- a/LongoMatch.Drawing/CanvasObjects/PlayersTaggerObject.cs
+++ b/LongoMatch.Drawing/CanvasObjects/PlayersTaggerObject.cs
@@ -17,13 +17,13 @@
 //
 using System;
 using System.Linq;
-using LongoMatch.Interfaces.Drawing;
-using LongoMatch.Store.Templates;
+using LongoMatch.Core.Interfaces.Drawing;
+using LongoMatch.Core.Store.Templates;
 using System.Collections.Generic;
-using LongoMatch.Common;
-using LongoMatch.Store.Drawables;
-using LongoMatch.Store;
-using LongoMatch.Handlers;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Store.Drawables;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Handlers;
 using System.IO;
 
 namespace LongoMatch.Drawing.CanvasObjects
diff --git a/LongoMatch.Drawing/CanvasObjects/PositionObject.cs 
b/LongoMatch.Drawing/CanvasObjects/PositionObject.cs
index a6aeed0..13a18ef 100644
--- a/LongoMatch.Drawing/CanvasObjects/PositionObject.cs
+++ b/LongoMatch.Drawing/CanvasObjects/PositionObject.cs
@@ -16,11 +16,11 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 using System;
-using LongoMatch.Interfaces.Drawing;
-using LongoMatch.Store.Drawables;
-using LongoMatch.Common;
-using LongoMatch.Store;
-using LongoMatch.Interfaces;
+using LongoMatch.Core.Interfaces.Drawing;
+using LongoMatch.Core.Store.Drawables;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Interfaces;
 using System.Collections.Generic;
 
 namespace LongoMatch.Drawing.CanvasObjects
diff --git a/LongoMatch.Drawing/CanvasObjects/QuadrilateralObject.cs 
b/LongoMatch.Drawing/CanvasObjects/QuadrilateralObject.cs
index c630feb..97bc2c8 100644
--- a/LongoMatch.Drawing/CanvasObjects/QuadrilateralObject.cs
+++ b/LongoMatch.Drawing/CanvasObjects/QuadrilateralObject.cs
@@ -16,10 +16,10 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 using System;
-using LongoMatch.Interfaces.Drawing;
-using LongoMatch.Store.Drawables;
-using LongoMatch.Common;
-using LongoMatch.Interfaces;
+using LongoMatch.Core.Interfaces.Drawing;
+using LongoMatch.Core.Store.Drawables;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Interfaces;
 
 namespace LongoMatch.Drawing.CanvasObjects
 {
diff --git a/LongoMatch.Drawing/CanvasObjects/RectangleObject.cs 
b/LongoMatch.Drawing/CanvasObjects/RectangleObject.cs
index 23a8d69..5408ecc 100644
--- a/LongoMatch.Drawing/CanvasObjects/RectangleObject.cs
+++ b/LongoMatch.Drawing/CanvasObjects/RectangleObject.cs
@@ -16,10 +16,10 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 using System;
-using LongoMatch.Store.Drawables;
-using LongoMatch.Interfaces.Drawing;
-using LongoMatch.Interfaces;
-using LongoMatch.Common;
+using LongoMatch.Core.Store.Drawables;
+using LongoMatch.Core.Interfaces.Drawing;
+using LongoMatch.Core.Interfaces;
+using LongoMatch.Core.Common;
 
 namespace LongoMatch.Drawing.CanvasObjects
 {
diff --git a/LongoMatch.Drawing/CanvasObjects/ScoreObject.cs b/LongoMatch.Drawing/CanvasObjects/ScoreObject.cs
index 72cb9b8..00206dd 100644
--- a/LongoMatch.Drawing/CanvasObjects/ScoreObject.cs
+++ b/LongoMatch.Drawing/CanvasObjects/ScoreObject.cs
@@ -16,10 +16,10 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 using System;
-using LongoMatch.Interfaces.Drawing;
-using LongoMatch.Common;
-using LongoMatch.Interfaces;
-using LongoMatch.Store;
+using LongoMatch.Core.Interfaces.Drawing;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Interfaces;
+using LongoMatch.Core.Store;
 
 namespace LongoMatch.Drawing.CanvasObjects
 {
diff --git a/LongoMatch.Drawing/CanvasObjects/TagObject.cs b/LongoMatch.Drawing/CanvasObjects/TagObject.cs
index 96c6698..7f189f7 100644
--- a/LongoMatch.Drawing/CanvasObjects/TagObject.cs
+++ b/LongoMatch.Drawing/CanvasObjects/TagObject.cs
@@ -16,10 +16,10 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 using System;
-using LongoMatch.Interfaces.Drawing;
-using LongoMatch.Common;
-using LongoMatch.Interfaces;
-using LongoMatch.Store;
+using LongoMatch.Core.Interfaces.Drawing;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Interfaces;
+using LongoMatch.Core.Store;
 
 namespace LongoMatch.Drawing.CanvasObjects
 {
diff --git a/LongoMatch.Drawing/CanvasObjects/TaggerObject.cs 
b/LongoMatch.Drawing/CanvasObjects/TaggerObject.cs
index 0737e44..0e1a592 100644
--- a/LongoMatch.Drawing/CanvasObjects/TaggerObject.cs
+++ b/LongoMatch.Drawing/CanvasObjects/TaggerObject.cs
@@ -16,12 +16,12 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 using System;
-using LongoMatch.Common;
-using LongoMatch.Interfaces;
-using LongoMatch.Interfaces.Drawing;
-using LongoMatch.Store.Drawables;
-using LongoMatch.Store;
-using LongoMatch.Handlers;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Interfaces;
+using LongoMatch.Core.Interfaces.Drawing;
+using LongoMatch.Core.Store.Drawables;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Handlers;
 
 namespace LongoMatch.Drawing.CanvasObjects
 {
diff --git a/LongoMatch.Drawing/CanvasObjects/TextObject.cs b/LongoMatch.Drawing/CanvasObjects/TextObject.cs
index 48b3fff..26c06f5 100644
--- a/LongoMatch.Drawing/CanvasObjects/TextObject.cs
+++ b/LongoMatch.Drawing/CanvasObjects/TextObject.cs
@@ -16,10 +16,10 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 using System;
-using LongoMatch.Store.Drawables;
-using LongoMatch.Interfaces.Drawing;
-using LongoMatch.Interfaces;
-using LongoMatch.Common;
+using LongoMatch.Core.Store.Drawables;
+using LongoMatch.Core.Interfaces.Drawing;
+using LongoMatch.Core.Interfaces;
+using LongoMatch.Core.Common;
 
 namespace LongoMatch.Drawing.CanvasObjects
 {
diff --git a/LongoMatch.Drawing/CanvasObjects/TimeNodeObject.cs 
b/LongoMatch.Drawing/CanvasObjects/TimeNodeObject.cs
index 77ac924..2f0bada 100644
--- a/LongoMatch.Drawing/CanvasObjects/TimeNodeObject.cs
+++ b/LongoMatch.Drawing/CanvasObjects/TimeNodeObject.cs
@@ -16,11 +16,11 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 using System;
-using LongoMatch.Store;
-using LongoMatch.Interfaces.Drawing;
-using LongoMatch.Interfaces;
-using LongoMatch.Common;
-using LongoMatch.Store.Drawables;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Interfaces.Drawing;
+using LongoMatch.Core.Interfaces;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Store.Drawables;
 using System.IO;
 
 namespace LongoMatch.Drawing.CanvasObjects
diff --git a/LongoMatch.Drawing/CanvasObjects/TimelineObject.cs 
b/LongoMatch.Drawing/CanvasObjects/TimelineObject.cs
index 5851999..a56388b 100644
--- a/LongoMatch.Drawing/CanvasObjects/TimelineObject.cs
+++ b/LongoMatch.Drawing/CanvasObjects/TimelineObject.cs
@@ -17,11 +17,11 @@
 //
 using System;
 using System.Collections.Generic;
-using LongoMatch.Store;
-using LongoMatch.Common;
-using LongoMatch.Interfaces;
-using LongoMatch.Interfaces.Drawing;
-using LongoMatch.Store.Drawables;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Interfaces;
+using LongoMatch.Core.Interfaces.Drawing;
+using LongoMatch.Core.Store.Drawables;
 using System.IO;
 
 namespace LongoMatch.Drawing.CanvasObjects
diff --git a/LongoMatch.Drawing/CanvasObjects/TimerObject.cs b/LongoMatch.Drawing/CanvasObjects/TimerObject.cs
index cccb0e5..c30c7de 100644
--- a/LongoMatch.Drawing/CanvasObjects/TimerObject.cs
+++ b/LongoMatch.Drawing/CanvasObjects/TimerObject.cs
@@ -17,10 +17,10 @@
 //
 using System;
 using System.Linq;
-using LongoMatch.Common;
-using LongoMatch.Interfaces;
-using LongoMatch.Interfaces.Drawing;
-using LongoMatch.Store;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Interfaces;
+using LongoMatch.Core.Interfaces.Drawing;
+using LongoMatch.Core.Store;
 
 namespace LongoMatch.Drawing.CanvasObjects
 {
diff --git a/LongoMatch.Drawing/Constants.cs b/LongoMatch.Drawing/Constants.cs
index a5e7382..31500cd 100644
--- a/LongoMatch.Drawing/Constants.cs
+++ b/LongoMatch.Drawing/Constants.cs
@@ -16,9 +16,9 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 using System;
-using LongoMatch.Store;
-using LongoMatch.Common;
-using LongoMatch.Interfaces.Drawing;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Interfaces.Drawing;
 
 namespace LongoMatch.Drawing
 {
diff --git a/LongoMatch.Drawing/Makefile.am b/LongoMatch.Drawing/Makefile.am
index 186e0c8..eb73414 100644
--- a/LongoMatch.Drawing/Makefile.am
+++ b/LongoMatch.Drawing/Makefile.am
@@ -33,7 +33,7 @@ SOURCES = Canvas.cs \
        Utils.cs \
        Widgets/Blackboard.cs \
        Widgets/CategoriesLabels.cs \
-       Widgets/Dashboard.cs \
+       Widgets/DashboardCanvas.cs \
        Widgets/PlaysTimeline.cs \
        Widgets/PositionTagger.cs \
        Widgets/TeamTagger.cs \
diff --git a/LongoMatch.Drawing/PlayslistCellRenderer.cs b/LongoMatch.Drawing/PlayslistCellRenderer.cs
index 1eff4f8..1834fb2 100644
--- a/LongoMatch.Drawing/PlayslistCellRenderer.cs
+++ b/LongoMatch.Drawing/PlayslistCellRenderer.cs
@@ -16,10 +16,10 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 using System;
-using LongoMatch.Interfaces.Drawing;
-using LongoMatch.Common;
-using LongoMatch.Store;
-using LongoMatch.Store.Playlists;
+using LongoMatch.Core.Interfaces.Drawing;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Store.Playlists;
 using System.IO;
 
 namespace LongoMatch.Drawing
diff --git a/LongoMatch.Drawing/Utils.cs b/LongoMatch.Drawing/Utils.cs
index 8f0fcb9..47a93d8 100644
--- a/LongoMatch.Drawing/Utils.cs
+++ b/LongoMatch.Drawing/Utils.cs
@@ -17,11 +17,11 @@
 //
 using System;
 using System.Linq;
-using LongoMatch.Store;
-using LongoMatch.Common;
-using LongoMatch.Interfaces.Drawing;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Interfaces.Drawing;
 using System.Runtime.Remoting;
-using LongoMatch.Store.Drawables;
+using LongoMatch.Core.Store.Drawables;
 
 namespace LongoMatch.Drawing
 {
diff --git a/LongoMatch.Drawing/Widgets/Blackboard.cs b/LongoMatch.Drawing/Widgets/Blackboard.cs
index c1dc9c7..7ef8c4e 100644
--- a/LongoMatch.Drawing/Widgets/Blackboard.cs
+++ b/LongoMatch.Drawing/Widgets/Blackboard.cs
@@ -18,13 +18,13 @@
 using System;
 using System.Linq;
 using System.Runtime.Remoting;
-using LongoMatch.Common;
-using LongoMatch.Interfaces.Drawing;
-using LongoMatch.Store;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Interfaces.Drawing;
+using LongoMatch.Core.Store;
 using LongoMatch.Drawing.CanvasObjects;
-using LongoMatch.Store.Drawables;
-using LongoMatch.Handlers;
-using LongoMatch.Interfaces;
+using LongoMatch.Core.Store.Drawables;
+using LongoMatch.Core.Handlers;
+using LongoMatch.Core.Interfaces;
 
 namespace LongoMatch.Drawing.Widgets
 {
diff --git a/LongoMatch.Drawing/Widgets/CategoriesLabels.cs b/LongoMatch.Drawing/Widgets/CategoriesLabels.cs
index 3da3a3c..f34bfd9 100644
--- a/LongoMatch.Drawing/Widgets/CategoriesLabels.cs
+++ b/LongoMatch.Drawing/Widgets/CategoriesLabels.cs
@@ -17,9 +17,9 @@
 //
 using System;
 using System.Collections.Generic;
-using LongoMatch.Store;
-using LongoMatch.Interfaces.Drawing;
-using LongoMatch.Common;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Interfaces.Drawing;
+using LongoMatch.Core.Common;
 using LongoMatch.Drawing.CanvasObjects;
 using Mono.Unix;
 
diff --git a/LongoMatch.Drawing/Widgets/DashboardCanvas.cs b/LongoMatch.Drawing/Widgets/DashboardCanvas.cs
index 5cd3e7a..24e3d9a 100644
--- a/LongoMatch.Drawing/Widgets/DashboardCanvas.cs
+++ b/LongoMatch.Drawing/Widgets/DashboardCanvas.cs
@@ -17,15 +17,15 @@
 //
 using System;
 using System.Linq;
-using LongoMatch.LongoMatch.Core.Store.Templates;
+using LongoMatch.Core.Store.Templates;
 using System.Collections.Generic;
-using LongoMatch.LongoMatch.Core.Common;
+using LongoMatch.Core.Common;
 using LongoMatch.Drawing.CanvasObjects;
-using LongoMatch.LongoMatch.Core.Handlers;
-using LongoMatch.LongoMatch.Core.Store;
-using LongoMatch.LongoMatch.Core.Store.Drawables;
-using LongoMatch.LongoMatch.Core.Interfaces.LongoMatch.Core.Interfaces.Drawing;
-using LongoMatch.LongoMatch.Core.Interfaces;
+using LongoMatch.Core.Handlers;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Store.Drawables;
+using LongoMatch.Core.Interfaces.Drawing;
+using LongoMatch.Core.Interfaces;
 
 namespace LongoMatch.Drawing.Widgets
 {
@@ -37,7 +37,7 @@ namespace LongoMatch.Drawing.Widgets
                public event ShowButtonsTaggerMenuHandler ShowMenuEvent;
                public event NewTagHandler NewTagEvent;
 
-               LongoMatch.LongoMatch.Core.Store.Templates.Dashboard template;
+               LongoMatch.Core.Store.Templates.Dashboard template;
                TagMode tagMode;
                Time currentTime;
                int templateWidth, templateHeight;
@@ -52,7 +52,7 @@ namespace LongoMatch.Drawing.Widgets
                        AddTag = new Tag ("", "");
                }
 
-               public LongoMatch.LongoMatch.Core.Store.Templates.Dashboard Template {
+               public LongoMatch.Core.Store.Templates.Dashboard Template {
                        set {
                                template = value;
                                LoadTemplate ();
diff --git a/LongoMatch.Drawing/Widgets/PlaysTimeline.cs b/LongoMatch.Drawing/Widgets/PlaysTimeline.cs
index 01bd1cb..62cb497 100644
--- a/LongoMatch.Drawing/Widgets/PlaysTimeline.cs
+++ b/LongoMatch.Drawing/Widgets/PlaysTimeline.cs
@@ -18,12 +18,12 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using LongoMatch.Store;
+using LongoMatch.Core.Store;
 using LongoMatch.Drawing.CanvasObjects;
-using LongoMatch.Common;
-using LongoMatch.Handlers;
-using LongoMatch.Interfaces.Drawing;
-using LongoMatch.Store.Drawables;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Handlers;
+using LongoMatch.Core.Interfaces.Drawing;
+using LongoMatch.Core.Store.Drawables;
 
 namespace LongoMatch.Drawing.Widgets
 {
diff --git a/LongoMatch.Drawing/Widgets/PositionTagger.cs b/LongoMatch.Drawing/Widgets/PositionTagger.cs
index ca1b4e5..4846e5b 100644
--- a/LongoMatch.Drawing/Widgets/PositionTagger.cs
+++ b/LongoMatch.Drawing/Widgets/PositionTagger.cs
@@ -17,13 +17,13 @@
 //
 using System;
 using System.Linq;
-using LongoMatch.Common;
+using LongoMatch.Core.Common;
 using System.Collections.Generic;
-using LongoMatch.Store;
+using LongoMatch.Core.Store;
 using LongoMatch.Drawing.CanvasObjects;
-using LongoMatch.Interfaces.Drawing;
-using LongoMatch.Store.Drawables;
-using LongoMatch.Handlers;
+using LongoMatch.Core.Interfaces.Drawing;
+using LongoMatch.Core.Store.Drawables;
+using LongoMatch.Core.Handlers;
 
 namespace LongoMatch.Drawing.Widgets
 {
diff --git a/LongoMatch.Drawing/Widgets/TeamTagger.cs b/LongoMatch.Drawing/Widgets/TeamTagger.cs
index b7aff43..fef23ff 100644
--- a/LongoMatch.Drawing/Widgets/TeamTagger.cs
+++ b/LongoMatch.Drawing/Widgets/TeamTagger.cs
@@ -18,13 +18,13 @@
 using System;
 using System.Linq;
 using System.Collections.Generic;
-using LongoMatch.Common;
-using LongoMatch.Interfaces.Drawing;
-using LongoMatch.Store.Drawables;
-using LongoMatch.Store.Templates;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Interfaces.Drawing;
+using LongoMatch.Core.Store.Drawables;
+using LongoMatch.Core.Store.Templates;
 using LongoMatch.Drawing.CanvasObjects;
-using LongoMatch.Store;
-using LongoMatch.Handlers;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Handlers;
 using System.IO;
 
 namespace LongoMatch.Drawing.Widgets
diff --git a/LongoMatch.Drawing/Widgets/TimersTimeline.cs b/LongoMatch.Drawing/Widgets/TimersTimeline.cs
index 9a3c54c..f19c919 100644
--- a/LongoMatch.Drawing/Widgets/TimersTimeline.cs
+++ b/LongoMatch.Drawing/Widgets/TimersTimeline.cs
@@ -1,10 +1,10 @@
 using System.Linq;
-using LongoMatch.Store;
+using LongoMatch.Core.Store;
 using LongoMatch.Drawing.CanvasObjects;
-using LongoMatch.Common;
-using LongoMatch.Handlers;
-using LongoMatch.Interfaces.Drawing;
-using LongoMatch.Store.Drawables;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Handlers;
+using LongoMatch.Core.Interfaces.Drawing;
+using LongoMatch.Core.Store.Drawables;
 using System.Collections.Generic;
 
 namespace LongoMatch.Drawing.Widgets
diff --git a/LongoMatch.Drawing/Widgets/Timerule.cs b/LongoMatch.Drawing/Widgets/Timerule.cs
index c2b93d1..59f0944 100644
--- a/LongoMatch.Drawing/Widgets/Timerule.cs
+++ b/LongoMatch.Drawing/Widgets/Timerule.cs
@@ -16,10 +16,10 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 using System;
-using LongoMatch.Store;
-using LongoMatch.Common;
-using LongoMatch.Interfaces.Drawing;
-using LongoMatch.Interfaces;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Interfaces.Drawing;
+using LongoMatch.Core.Interfaces;
 using System.IO;
 
 namespace LongoMatch.Drawing.Widgets
diff --git a/LongoMatch.GUI.Helpers/Misc.cs b/LongoMatch.GUI.Helpers/Misc.cs
index 346f30a..64b0d05 100644
--- a/LongoMatch.GUI.Helpers/Misc.cs
+++ b/LongoMatch.GUI.Helpers/Misc.cs
@@ -23,13 +23,13 @@ using Gtk;
 using Gdk;
 using Mono.Unix;
 
-using LongoMatch.Common;
-using LColor = LongoMatch.Common.Color; 
+using LongoMatch.Core.Common;
+using LColor = LongoMatch.Core.Common.Color; 
 using Color = Gdk.Color;
 using System.Collections.Generic;
-using LongoMatch.Store;
-using LongoMatch.Interfaces.GUI;
-using LongoMatch.Interfaces.Multimedia;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Interfaces.GUI;
+using LongoMatch.Core.Interfaces.Multimedia;
 
 namespace LongoMatch.Gui.Helpers
 {
diff --git a/LongoMatch.GUI.Multimedia/Gui/CapturerBin.cs b/LongoMatch.GUI.Multimedia/Gui/CapturerBin.cs
index aa3a393..f299d5c 100644
--- a/LongoMatch.GUI.Multimedia/Gui/CapturerBin.cs
+++ b/LongoMatch.GUI.Multimedia/Gui/CapturerBin.cs
@@ -20,14 +20,14 @@
 using System;
 using System.Collections.Generic;
 using Gtk;
-using LongoMatch.Common;
+using LongoMatch.Core.Common;
 using LongoMatch.Gui.Helpers;
-using LongoMatch.Interfaces.GUI;
-using LongoMatch.Interfaces.Multimedia;
+using LongoMatch.Core.Interfaces.GUI;
+using LongoMatch.Core.Interfaces.Multimedia;
 using LongoMatch.Multimedia.Utils;
-using LongoMatch.Store;
+using LongoMatch.Core.Store;
 using Mono.Unix;
-using Image = LongoMatch.Common.Image;
+using Image = LongoMatch.Core.Common.Image;
 
 namespace LongoMatch.Gui
 {
diff --git a/LongoMatch.GUI.Multimedia/Gui/PlayerBin.cs b/LongoMatch.GUI.Multimedia/Gui/PlayerBin.cs
index a83fc66..6e53e6e 100644
--- a/LongoMatch.GUI.Multimedia/Gui/PlayerBin.cs
+++ b/LongoMatch.GUI.Multimedia/Gui/PlayerBin.cs
@@ -21,18 +21,19 @@ using System;
 using System.Linq;
 using Gdk;
 using Gtk;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Handlers;
+using LongoMatch.Core.Interfaces;
+using LongoMatch.Core.Interfaces.GUI;
+using LongoMatch.Core.Interfaces.Multimedia;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Store.Playlists;
 using LongoMatch.Drawing.Cairo;
 using LongoMatch.Drawing.Widgets;
-using LongoMatch.Handlers;
-using LongoMatch.Interfaces;
-using LongoMatch.Interfaces.GUI;
-using LongoMatch.Interfaces.Multimedia;
 using LongoMatch.Multimedia.Utils;
-using LongoMatch.Store;
-using LongoMatch.Store.Playlists;
 using LongoMatch.Video.Common;
 using LongoMatch.Video.Utils;
-using Image = LongoMatch.Common.Image;
+using Image = LongoMatch.Core.Common.Image;
 
 namespace LongoMatch.Gui
 {
diff --git a/LongoMatch.GUI.Multimedia/Gui/PlayerCapturerBin.cs 
b/LongoMatch.GUI.Multimedia/Gui/PlayerCapturerBin.cs
index 32783e6..48e525b 100644
--- a/LongoMatch.GUI.Multimedia/Gui/PlayerCapturerBin.cs
+++ b/LongoMatch.GUI.Multimedia/Gui/PlayerCapturerBin.cs
@@ -17,13 +17,13 @@
 // 
 using System;
 
-using LongoMatch.Handlers;
-using LongoMatch.Interfaces.GUI;
-using LongoMatch.Common;
-using LongoMatch.Store;
+using LongoMatch.Core.Handlers;
+using LongoMatch.Core.Interfaces.GUI;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Store;
 using System.Collections.Generic;
-using LongoMatch.Interfaces;
-using LongoMatch.Store.Playlists;
+using LongoMatch.Core.Interfaces;
+using LongoMatch.Core.Store.Playlists;
 
 namespace LongoMatch.Gui
 {
diff --git a/LongoMatch.GUI.Multimedia/Gui/Utils/FramesCapturer.cs 
b/LongoMatch.GUI.Multimedia/Gui/Utils/FramesCapturer.cs
index 5e3b0df..d858939 100644
--- a/LongoMatch.GUI.Multimedia/Gui/Utils/FramesCapturer.cs
+++ b/LongoMatch.GUI.Multimedia/Gui/Utils/FramesCapturer.cs
@@ -21,11 +21,11 @@
 using System;
 using System.Threading;
 
-using LongoMatch.Common;
-using LongoMatch.Interfaces.Multimedia;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Interfaces.Multimedia;
 using LongoMatch.Video;
 using LongoMatch.Video.Common;
-using LongoMatch.Store;
+using LongoMatch.Core.Store;
 using LongoMatch.Multimedia.Utils;
 using Gtk;
 
@@ -46,7 +46,7 @@ namespace LongoMatch.Video.Utils
                private const int THUMBNAIL_MAX_HEIGHT=250;
                private const int THUMBNAIL_MAX_WIDTH=300;
 
-               public event LongoMatch.Handlers.FramesProgressHandler Progress;
+               public event LongoMatch.Core.Handlers.FramesProgressHandler Progress;
 
                public FramesSeriesCapturer(string videoFile, Time start, Time stop, uint interval, string 
outputDir)
                {
@@ -72,7 +72,7 @@ namespace LongoMatch.Video.Utils
 
                public void CaptureFrames() {
                        Time pos;
-                       LongoMatch.Common.Image frame;
+                       LongoMatch.Core.Common.Image frame;
                        int i = 0;
 
                        System.IO.Directory.CreateDirectory(outputDir);
diff --git a/LongoMatch.GUI.Multimedia/Gui/Utils/Remuxer.cs b/LongoMatch.GUI.Multimedia/Gui/Utils/Remuxer.cs
index 1d9a3ea..143a235 100644
--- a/LongoMatch.GUI.Multimedia/Gui/Utils/Remuxer.cs
+++ b/LongoMatch.GUI.Multimedia/Gui/Utils/Remuxer.cs
@@ -22,10 +22,10 @@ using Mono.Unix;
 using GLib;
 using Gtk;
 
-using LongoMatch.Interfaces.Multimedia;
+using LongoMatch.Core.Interfaces.Multimedia;
 using LongoMatch.Multimedia.Utils;
-using LongoMatch.Common;
-using LongoMatch.Store;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Store;
 
 namespace LongoMatch.Video.Utils
 {
diff --git a/LongoMatch.GUI.Multimedia/Gui/VolumeWindow.cs b/LongoMatch.GUI.Multimedia/Gui/VolumeWindow.cs
index 6bea6bc..6819763 100644
--- a/LongoMatch.GUI.Multimedia/Gui/VolumeWindow.cs
+++ b/LongoMatch.GUI.Multimedia/Gui/VolumeWindow.cs
@@ -19,7 +19,7 @@
 //
 using System;
 using LongoMatch.Video.Common;
-using LongoMatch.Handlers;
+using LongoMatch.Core.Handlers;
 
 namespace LongoMatch.Gui
 {
diff --git a/LongoMatch.GUI.Multimedia/MultimediaToolkit.cs b/LongoMatch.GUI.Multimedia/MultimediaToolkit.cs
index b01b467..ada2873 100644
--- a/LongoMatch.GUI.Multimedia/MultimediaToolkit.cs
+++ b/LongoMatch.GUI.Multimedia/MultimediaToolkit.cs
@@ -18,8 +18,8 @@
 //
 //
 using LongoMatch.Video.Utils;
-using LongoMatch.Interfaces.Multimedia;
-using LongoMatch.Store;
+using LongoMatch.Core.Interfaces.Multimedia;
+using LongoMatch.Core.Store;
 
 using Remuxer = LongoMatch.Video.Utils;
 
diff --git a/LongoMatch.GUI/Gui/Cairo.cs b/LongoMatch.GUI/Gui/Cairo.cs
index 7766e97..8a6beed 100644
--- a/LongoMatch.GUI/Gui/Cairo.cs
+++ b/LongoMatch.GUI/Gui/Cairo.cs
@@ -20,7 +20,7 @@ using Cairo;
 using LongoMatch.Gui.Helpers;
 
 
-namespace LongoMatch.Common
+namespace LongoMatch.Core.Common
 {
        public class CairoUtils
        {
diff --git a/LongoMatch.GUI/Gui/Component/AnalysisComponent.cs 
b/LongoMatch.GUI/Gui/Component/AnalysisComponent.cs
index 6b0c8b5..e68ebf3 100644
--- a/LongoMatch.GUI/Gui/Component/AnalysisComponent.cs
+++ b/LongoMatch.GUI/Gui/Component/AnalysisComponent.cs
@@ -17,9 +17,9 @@
 //
 using System.Collections.Generic;
 using Gtk;
-using LongoMatch.Common;
-using LongoMatch.Interfaces.GUI;
-using LongoMatch.Store;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Interfaces.GUI;
+using LongoMatch.Core.Store;
 
 namespace LongoMatch.Gui.Component
 {
diff --git a/LongoMatch.GUI/Gui/Component/BackgroundWidget.cs 
b/LongoMatch.GUI/Gui/Component/BackgroundWidget.cs
index c5bd1e6..12369dc 100644
--- a/LongoMatch.GUI/Gui/Component/BackgroundWidget.cs
+++ b/LongoMatch.GUI/Gui/Component/BackgroundWidget.cs
@@ -19,7 +19,7 @@ using System;
 using Gtk;
 using Gdk;
 
-using Image = LongoMatch.Common.Image;
+using Image = LongoMatch.Core.Common.Image;
 
 
 namespace LongoMatch.Gui.Component
diff --git a/LongoMatch.GUI/Gui/Component/ButtonTagger.cs b/LongoMatch.GUI/Gui/Component/ButtonTagger.cs
index 98c9750..1fd5b50 100644
--- a/LongoMatch.GUI/Gui/Component/ButtonTagger.cs
+++ b/LongoMatch.GUI/Gui/Component/ButtonTagger.cs
@@ -20,7 +20,7 @@ using Gtk;
 using Gdk;
 
 using LongoMatch.Common;
-using LongoMatch.Handlers;
+using LongoMatch.Core.Handlers;
 using LongoMatch.Store;
 using Color = Gdk.Color;
 
diff --git a/LongoMatch.GUI/Gui/Component/CategoryProperties.cs 
b/LongoMatch.GUI/Gui/Component/CategoryProperties.cs
index ff21c0e..fca1a17 100644
--- a/LongoMatch.GUI/Gui/Component/CategoryProperties.cs
+++ b/LongoMatch.GUI/Gui/Component/CategoryProperties.cs
@@ -22,10 +22,10 @@ using System;
 using Gtk;
 using Mono.Unix;
 
-using LongoMatch.Common;
-using LongoMatch.Store;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Store;
 using LongoMatch.Gui.Dialog;
-using Point = LongoMatch.Common.Point;
+using Point = LongoMatch.Core.Common.Point;
 
 namespace LongoMatch.Gui.Component
 {
@@ -290,7 +290,7 @@ namespace LongoMatch.Gui.Component
                        if (ignore)
                                return;
 
-                       LongoMatch.Common.Color c = Helpers.Misc.ToLgmColor((sender as ColorButton).Color);
+                       LongoMatch.Core.Common.Color c = Helpers.Misc.ToLgmColor((sender as 
ColorButton).Color);
                        if (sender == colorbutton1) {
                                button.BackgroundColor = c;
                        } else {
diff --git a/LongoMatch.GUI/Gui/Component/CodingWidget.cs b/LongoMatch.GUI/Gui/Component/CodingWidget.cs
index 270ff31..4015846 100644
--- a/LongoMatch.GUI/Gui/Component/CodingWidget.cs
+++ b/LongoMatch.GUI/Gui/Component/CodingWidget.cs
@@ -19,9 +19,9 @@ using System;
 using System.Linq;
 using System.Collections.Generic;
 using Gtk;
-using LongoMatch.Handlers;
-using LongoMatch.Store;
-using LongoMatch.Common;
+using LongoMatch.Core.Handlers;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Common;
 using LongoMatch.Drawing.Widgets;
 using LongoMatch.Drawing.Cairo;
 using LongoMatch.Gui.Helpers;
diff --git a/LongoMatch.GUI/Gui/Component/CoordinatesTagger.cs 
b/LongoMatch.GUI/Gui/Component/CoordinatesTagger.cs
index 99662f0..b41e2b2 100644
--- a/LongoMatch.GUI/Gui/Component/CoordinatesTagger.cs
+++ b/LongoMatch.GUI/Gui/Component/CoordinatesTagger.cs
@@ -17,8 +17,8 @@
 //
 using System;
 using LongoMatch.Drawing.Widgets;
-using LongoMatch.Store;
-using LongoMatch.Common;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Common;
 using LongoMatch.Drawing.Cairo;
 
 namespace LongoMatch.Gui.Component
diff --git a/LongoMatch.GUI/Gui/Component/DashboardWidget.cs b/LongoMatch.GUI/Gui/Component/DashboardWidget.cs
index 0df571b..34846f3 100644
--- a/LongoMatch.GUI/Gui/Component/DashboardWidget.cs
+++ b/LongoMatch.GUI/Gui/Component/DashboardWidget.cs
@@ -21,16 +21,16 @@
 using System;
 using System.Collections.Generic;
 using Gtk;
-using LongoMatch.Common;
-using LongoMatch.Handlers;
-using LongoMatch.Store;
-using LongoMatch.Store.Templates;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Handlers;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Store.Templates;
 using LongoMatch.Gui;
 using Helpers = LongoMatch.Gui.Helpers;
 using LongoMatch.Drawing.Widgets;
 using LongoMatch.Drawing.Cairo;
 using Mono.Unix;
-using Image = LongoMatch.Common.Image;
+using Image = LongoMatch.Core.Common.Image;
 using LongoMatch.Gui.Helpers;
 
 namespace LongoMatch.Gui.Component
@@ -282,7 +282,7 @@ namespace LongoMatch.Gui.Component
                
                void HandleFieldButtonPressEvent (object o, Gtk.ButtonPressEventArgs args)
                {
-                       LongoMatch.Common.Image background;
+                       LongoMatch.Core.Common.Image background;
                        Gdk.Pixbuf pix = Helpers.Misc.OpenImage (this);
                        
                        if (pix == null) {
diff --git a/LongoMatch.GUI/Gui/Component/DrawingToolBox.cs b/LongoMatch.GUI/Gui/Component/DrawingToolBox.cs
index 5eeca65..2d37c08 100644
--- a/LongoMatch.GUI/Gui/Component/DrawingToolBox.cs
+++ b/LongoMatch.GUI/Gui/Component/DrawingToolBox.cs
@@ -19,7 +19,7 @@
 using System;
 using Gtk;
 using Gdk;
-using LongoMatch.Handlers;
+using LongoMatch.Core.Handlers;
 using LongoMatch.Common;
 using Color = Gdk.Color;
 
diff --git a/LongoMatch.GUI/Gui/Component/GameUnitWidget.cs b/LongoMatch.GUI/Gui/Component/GameUnitWidget.cs
index 1ba2086..da06b33 100644
--- a/LongoMatch.GUI/Gui/Component/GameUnitWidget.cs
+++ b/LongoMatch.GUI/Gui/Component/GameUnitWidget.cs
@@ -22,7 +22,7 @@ using Mono.Unix;
 
 using LongoMatch.Common;
 using LongoMatch.Store;
-using LongoMatch.Handlers;
+using LongoMatch.Core.Handlers;
 
 namespace LongoMatch.Gui.Component
 {
diff --git a/LongoMatch.GUI/Gui/Component/GameUnitsTagger.cs b/LongoMatch.GUI/Gui/Component/GameUnitsTagger.cs
index 8c46a08..8aecf80 100644
--- a/LongoMatch.GUI/Gui/Component/GameUnitsTagger.cs
+++ b/LongoMatch.GUI/Gui/Component/GameUnitsTagger.cs
@@ -19,7 +19,7 @@ using System;
 using System.Collections.Generic;
 
 using LongoMatch.Store;
-using LongoMatch.Handlers;
+using LongoMatch.Core.Handlers;
 
 namespace LongoMatch.Gui.Component
 {
diff --git a/LongoMatch.GUI/Gui/Component/GeneralPreferencesPanel.cs 
b/LongoMatch.GUI/Gui/Component/GeneralPreferencesPanel.cs
index 6d51645..ed0ee51 100644
--- a/LongoMatch.GUI/Gui/Component/GeneralPreferencesPanel.cs
+++ b/LongoMatch.GUI/Gui/Component/GeneralPreferencesPanel.cs
@@ -18,7 +18,7 @@
 using System;
 using Mono.Unix;
 using Gtk;
-using LongoMatch.Common;
+using LongoMatch.Core.Common;
 using System.Globalization;
 
 namespace LongoMatch.Gui.Component
diff --git a/LongoMatch.GUI/Gui/Component/MediaFileChooser.cs 
b/LongoMatch.GUI/Gui/Component/MediaFileChooser.cs
index f9da9d2..3e38821 100644
--- a/LongoMatch.GUI/Gui/Component/MediaFileChooser.cs
+++ b/LongoMatch.GUI/Gui/Component/MediaFileChooser.cs
@@ -18,7 +18,7 @@
 using System;
 using System.IO;
 using Mono.Unix;
-using LongoMatch.Store;
+using LongoMatch.Core.Store;
 using LongoMatch.Gui.Helpers;
 
 namespace LongoMatch.Gui.Component
diff --git a/LongoMatch.GUI/Gui/Component/NotesWidget.cs b/LongoMatch.GUI/Gui/Component/NotesWidget.cs
index 6051050..d2f4602 100644
--- a/LongoMatch.GUI/Gui/Component/NotesWidget.cs
+++ b/LongoMatch.GUI/Gui/Component/NotesWidget.cs
@@ -20,8 +20,8 @@
 
 using System;
 using Gtk;
-using LongoMatch.Store;
-using LongoMatch.Handlers;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Handlers;
 
 namespace LongoMatch.Gui.Component
 {
diff --git a/LongoMatch.GUI/Gui/Component/PeriodsRecoder.cs b/LongoMatch.GUI/Gui/Component/PeriodsRecoder.cs
index 4bd3f6c..b26c762 100644
--- a/LongoMatch.GUI/Gui/Component/PeriodsRecoder.cs
+++ b/LongoMatch.GUI/Gui/Component/PeriodsRecoder.cs
@@ -17,7 +17,7 @@
 //
 using System;
 using System.Collections.Generic;
-using LongoMatch.Store;
+using LongoMatch.Core.Store;
 
 namespace LongoMatch.Gui.Component
 {
diff --git a/LongoMatch.GUI/Gui/Component/PlayListWidget.cs b/LongoMatch.GUI/Gui/Component/PlayListWidget.cs
index 7e74fbb..0abd180 100644
--- a/LongoMatch.GUI/Gui/Component/PlayListWidget.cs
+++ b/LongoMatch.GUI/Gui/Component/PlayListWidget.cs
@@ -20,11 +20,11 @@
 using System.Linq;
 using System.Collections.Generic;
 using Gtk;
-using LongoMatch.Common;
-using LongoMatch.Handlers;
-using LongoMatch.Interfaces;
-using LongoMatch.Store.Playlists;
-using LongoMatch.Store;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Handlers;
+using LongoMatch.Core.Interfaces;
+using LongoMatch.Core.Store.Playlists;
+using LongoMatch.Core.Store;
 using Mono.Unix;
 
 namespace LongoMatch.Gui.Component
diff --git a/LongoMatch.GUI/Gui/Component/PlayersListTreeWidget.cs 
b/LongoMatch.GUI/Gui/Component/PlayersListTreeWidget.cs
index 50338b7..975523f 100644
--- a/LongoMatch.GUI/Gui/Component/PlayersListTreeWidget.cs
+++ b/LongoMatch.GUI/Gui/Component/PlayersListTreeWidget.cs
@@ -19,11 +19,11 @@
 using System;
 using System.Collections.Generic;
 using Gtk;
-using LongoMatch.Common;
-using LongoMatch.Handlers;
-using LongoMatch.Store;
-using LongoMatch.Store.Playlists;
-using LongoMatch.Store.Templates;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Handlers;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Store.Playlists;
+using LongoMatch.Core.Store.Templates;
 
 
 namespace LongoMatch.Gui.Component
diff --git a/LongoMatch.GUI/Gui/Component/PlaysCoordinatesTagger.cs 
b/LongoMatch.GUI/Gui/Component/PlaysCoordinatesTagger.cs
index c6141a0..19a8a38 100644
--- a/LongoMatch.GUI/Gui/Component/PlaysCoordinatesTagger.cs
+++ b/LongoMatch.GUI/Gui/Component/PlaysCoordinatesTagger.cs
@@ -15,11 +15,11 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
-using LongoMatch.Common;
-using LongoMatch.Stats;
-using LongoMatch.Store;
-using Image = LongoMatch.Common.Image;
-using Point = LongoMatch.Common.Point;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Stats;
+using LongoMatch.Core.Store;
+using Image = LongoMatch.Core.Common.Image;
+using Point = LongoMatch.Core.Common.Point;
 
 namespace LongoMatch.Gui.Component
 {
diff --git a/LongoMatch.GUI/Gui/Component/PlaysListTreeWidget.cs 
b/LongoMatch.GUI/Gui/Component/PlaysListTreeWidget.cs
index 6b8e1cf..e65730e 100644
--- a/LongoMatch.GUI/Gui/Component/PlaysListTreeWidget.cs
+++ b/LongoMatch.GUI/Gui/Component/PlaysListTreeWidget.cs
@@ -21,9 +21,9 @@
 using System;
 using System.Collections.Generic;
 using Gtk;
-using LongoMatch.Common;
-using LongoMatch.Store;
-using LongoMatch.Store.Playlists;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Store.Playlists;
 using LongoMatch.Gui.Dialog;
 
 namespace LongoMatch.Gui.Component
diff --git a/LongoMatch.GUI/Gui/Component/PlaysPositionViewer.cs 
b/LongoMatch.GUI/Gui/Component/PlaysPositionViewer.cs
index ba303d7..3df4591 100644
--- a/LongoMatch.GUI/Gui/Component/PlaysPositionViewer.cs
+++ b/LongoMatch.GUI/Gui/Component/PlaysPositionViewer.cs
@@ -16,8 +16,8 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 using System;
-using LongoMatch.Common;
-using LongoMatch.Store;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Store;
 using LongoMatch.Gui.Menus;
 using System.Collections.Generic;
 
diff --git a/LongoMatch.GUI/Gui/Component/PlaysSelectionWidget.cs 
b/LongoMatch.GUI/Gui/Component/PlaysSelectionWidget.cs
index 960e1a2..346c0db 100644
--- a/LongoMatch.GUI/Gui/Component/PlaysSelectionWidget.cs
+++ b/LongoMatch.GUI/Gui/Component/PlaysSelectionWidget.cs
@@ -20,10 +20,10 @@ using System.Collections.Generic;
 using Mono.Unix;
 using Gtk;
 
-using LongoMatch.Common;
-using LongoMatch.Handlers;
-using LongoMatch.Interfaces;
-using LongoMatch.Store;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Handlers;
+using LongoMatch.Core.Interfaces;
+using LongoMatch.Core.Store;
 using Helpers = LongoMatch.Gui.Helpers;
 using Gdk;
 
diff --git a/LongoMatch.GUI/Gui/Component/ProjectDetailsWidget.cs 
b/LongoMatch.GUI/Gui/Component/ProjectDetailsWidget.cs
index 6468366..2ba2940 100644
--- a/LongoMatch.GUI/Gui/Component/ProjectDetailsWidget.cs
+++ b/LongoMatch.GUI/Gui/Component/ProjectDetailsWidget.cs
@@ -25,7 +25,7 @@ using Mono.Unix;
 using LongoMatch.Common;
 using LongoMatch.Gui.Dialog;
 using LongoMatch.Gui.Popup;
-using LongoMatch.Handlers;
+using LongoMatch.Core.Handlers;
 using LongoMatch.Interfaces;
 using LongoMatch.Store;
 using LongoMatch.Store.Templates;
diff --git a/LongoMatch.GUI/Gui/Component/ProjectListWidget.cs 
b/LongoMatch.GUI/Gui/Component/ProjectListWidget.cs
index 09ffb22..ee5c8f9 100644
--- a/LongoMatch.GUI/Gui/Component/ProjectListWidget.cs
+++ b/LongoMatch.GUI/Gui/Component/ProjectListWidget.cs
@@ -25,9 +25,9 @@ using System.Linq;
 using Mono.Unix;
 using Gtk;
 
-using LongoMatch.Common;
-using LongoMatch.Handlers;
-using LongoMatch.Store;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Handlers;
+using LongoMatch.Core.Store;
 using LongoMatch.Video.Utils;
 using Gdk;
 
diff --git a/LongoMatch.GUI/Gui/Component/ProjectPeriods.cs b/LongoMatch.GUI/Gui/Component/ProjectPeriods.cs
index a10926c..b60929a 100644
--- a/LongoMatch.GUI/Gui/Component/ProjectPeriods.cs
+++ b/LongoMatch.GUI/Gui/Component/ProjectPeriods.cs
@@ -16,7 +16,7 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 using System;
-using LongoMatch.Store;
+using LongoMatch.Core.Store;
 using System.Collections.Generic;
 using LongoMatch.Drawing.Widgets;
 using LongoMatch.Drawing.Cairo;
diff --git a/LongoMatch.GUI/Gui/Component/RenderingStateBar.cs 
b/LongoMatch.GUI/Gui/Component/RenderingStateBar.cs
index 7ba426a..a26a448 100644
--- a/LongoMatch.GUI/Gui/Component/RenderingStateBar.cs
+++ b/LongoMatch.GUI/Gui/Component/RenderingStateBar.cs
@@ -16,7 +16,7 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 // 
 using System;
-using LongoMatch.Interfaces.GUI;
+using LongoMatch.Core.Interfaces.GUI;
 
 namespace LongoMatch.Gui.Component
 {
diff --git a/LongoMatch.GUI/Gui/Component/Stats/CategoriesViewer.cs 
b/LongoMatch.GUI/Gui/Component/Stats/CategoriesViewer.cs
index 8a40156..2aba506 100644
--- a/LongoMatch.GUI/Gui/Component/Stats/CategoriesViewer.cs
+++ b/LongoMatch.GUI/Gui/Component/Stats/CategoriesViewer.cs
@@ -18,9 +18,9 @@
 using System;
 using Gtk;
 
-using LongoMatch.Stats;
-using LongoMatch.Store;
-using LongoMatch.Common;
+using LongoMatch.Core.Stats;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Common;
 
 namespace LongoMatch.Gui.Component.Stats
 {
diff --git a/LongoMatch.GUI/Gui/Component/Stats/CategoryViewer.cs 
b/LongoMatch.GUI/Gui/Component/Stats/CategoryViewer.cs
index 07a42fd..683fcb9 100644
--- a/LongoMatch.GUI/Gui/Component/Stats/CategoryViewer.cs
+++ b/LongoMatch.GUI/Gui/Component/Stats/CategoryViewer.cs
@@ -17,11 +17,11 @@
 //
 using System;
 using Gtk;
-using LongoMatch.Stats;
+using LongoMatch.Core.Stats;
 using System.Collections.Generic;
-using LongoMatch.Common;
-using Image = LongoMatch.Common.Image;
-using LongoMatch.Store;
+using LongoMatch.Core.Common;
+using Image = LongoMatch.Core.Common.Image;
+using LongoMatch.Core.Store;
 
 namespace LongoMatch.Gui.Component.Stats
 {
diff --git a/LongoMatch.GUI/Gui/Component/Stats/GameViewer.cs 
b/LongoMatch.GUI/Gui/Component/Stats/GameViewer.cs
index b035011..946bb89 100644
--- a/LongoMatch.GUI/Gui/Component/Stats/GameViewer.cs
+++ b/LongoMatch.GUI/Gui/Component/Stats/GameViewer.cs
@@ -23,9 +23,9 @@ using Cairo;
 using Pango;
 using Color = Cairo.Color;
 
-using LongoMatch.Common;
-using LongoMatch.Stats;
-using LongoMatch.Store;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Stats;
+using LongoMatch.Core.Store;
 
 namespace LongoMatch.Gui.Component
 {
diff --git a/LongoMatch.GUI/Gui/Component/Stats/PlayerCategoriesViewer.cs 
b/LongoMatch.GUI/Gui/Component/Stats/PlayerCategoriesViewer.cs
index 268539f..5e3557a 100644
--- a/LongoMatch.GUI/Gui/Component/Stats/PlayerCategoriesViewer.cs
+++ b/LongoMatch.GUI/Gui/Component/Stats/PlayerCategoriesViewer.cs
@@ -17,8 +17,8 @@
 //
 using System;
 using Gtk;
-using LongoMatch.Stats;
-using LongoMatch.Store;
+using LongoMatch.Core.Stats;
+using LongoMatch.Core.Store;
 
 namespace LongoMatch.Gui.Component.Stats
 {
diff --git a/LongoMatch.GUI/Gui/Component/Stats/PlayerCategoryViewer.cs 
b/LongoMatch.GUI/Gui/Component/Stats/PlayerCategoryViewer.cs
index b5c69ce..756ed7a 100644
--- a/LongoMatch.GUI/Gui/Component/Stats/PlayerCategoryViewer.cs
+++ b/LongoMatch.GUI/Gui/Component/Stats/PlayerCategoryViewer.cs
@@ -19,10 +19,10 @@ using System;
 using System.Collections.Generic;
 using Gtk;
 
-using LongoMatch.Common;
-using LongoMatch.Stats;
-using Image = LongoMatch.Common.Image;
-using LongoMatch.Store;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Stats;
+using Image = LongoMatch.Core.Common.Image;
+using LongoMatch.Core.Store;
 
 namespace LongoMatch.Gui.Component.Stats
 {
diff --git a/LongoMatch.GUI/Gui/Component/Stats/PlayerSubcategoryViewer.cs 
b/LongoMatch.GUI/Gui/Component/Stats/PlayerSubcategoryViewer.cs
index 6fa3179..8baa549 100644
--- a/LongoMatch.GUI/Gui/Component/Stats/PlayerSubcategoryViewer.cs
+++ b/LongoMatch.GUI/Gui/Component/Stats/PlayerSubcategoryViewer.cs
@@ -19,8 +19,8 @@ using System;
 using Gtk;
 using Mono.Unix;
 
-using LongoMatch.Stats;
-using LongoMatch.Common;
+using LongoMatch.Core.Stats;
+using LongoMatch.Core.Common;
 
 namespace LongoMatch.Gui.Component.Stats
 {
diff --git a/LongoMatch.GUI/Gui/Component/Stats/PlayersViewer.cs 
b/LongoMatch.GUI/Gui/Component/Stats/PlayersViewer.cs
index eb41c9d..03e1c5c 100644
--- a/LongoMatch.GUI/Gui/Component/Stats/PlayersViewer.cs
+++ b/LongoMatch.GUI/Gui/Component/Stats/PlayersViewer.cs
@@ -17,12 +17,12 @@
 //
 using System;
 
-using LongoMatch.Store;
+using LongoMatch.Core.Store;
 using Gtk;
 using Mono.Unix;
-using LongoMatch.Store.Templates;
-using LongoMatch.Stats;
-using LongoMatch.Common;
+using LongoMatch.Core.Store.Templates;
+using LongoMatch.Core.Stats;
+using LongoMatch.Core.Common;
 
 namespace LongoMatch.Gui.Component.Stats
 {
diff --git a/LongoMatch.GUI/Gui/Component/Stats/Plotter.cs b/LongoMatch.GUI/Gui/Component/Stats/Plotter.cs
index 4345d90..feb73e1 100644
--- a/LongoMatch.GUI/Gui/Component/Stats/Plotter.cs
+++ b/LongoMatch.GUI/Gui/Component/Stats/Plotter.cs
@@ -24,8 +24,8 @@ using OxyPlot;
 using OxyPlot.Series;
 using OxyPlot.Axes;
 
-using LongoMatch.Stats;
-using LongoMatch.Common;
+using LongoMatch.Core.Stats;
+using LongoMatch.Core.Common;
 using Mono.Unix;
 using Gtk;
 
diff --git a/LongoMatch.GUI/Gui/Component/Stats/SubcategoryViewer.cs 
b/LongoMatch.GUI/Gui/Component/Stats/SubcategoryViewer.cs
index 9e02dff..a6e8285 100644
--- a/LongoMatch.GUI/Gui/Component/Stats/SubcategoryViewer.cs
+++ b/LongoMatch.GUI/Gui/Component/Stats/SubcategoryViewer.cs
@@ -19,8 +19,8 @@ using System;
 using Gtk;
 using Mono.Unix;
 
-using LongoMatch.Stats;
-using LongoMatch.Common;
+using LongoMatch.Core.Stats;
+using LongoMatch.Core.Common;
 
 namespace LongoMatch.Gui.Component.Stats
 {
diff --git a/LongoMatch.GUI/Gui/Component/TeamTemplateEditor.cs 
b/LongoMatch.GUI/Gui/Component/TeamTemplateEditor.cs
index 4009df6..294a175 100644
--- a/LongoMatch.GUI/Gui/Component/TeamTemplateEditor.cs
+++ b/LongoMatch.GUI/Gui/Component/TeamTemplateEditor.cs
@@ -20,13 +20,13 @@ using System.Linq;
 using System.Collections.Generic;
 using Gtk;
 using Gdk;
-using LongoMatch.Store.Templates;
-using LongoMatch.Store;
+using LongoMatch.Core.Store.Templates;
+using LongoMatch.Core.Store;
 using Mono.Unix;
 
-using Image = LongoMatch.Common.Image;
-using Color = LongoMatch.Common.Color;
-using LongoMatch.Common;
+using Image = LongoMatch.Core.Common.Image;
+using Color = LongoMatch.Core.Common.Color;
+using LongoMatch.Core.Common;
 using LongoMatch.Gui.Popup;
 using LongoMatch.Gui.Dialog;
 using LongoMatch.Drawing.Widgets;
diff --git a/LongoMatch.GUI/Gui/Component/TeamsComboBox.cs b/LongoMatch.GUI/Gui/Component/TeamsComboBox.cs
index 6da1d73..2c4e3e9 100644
--- a/LongoMatch.GUI/Gui/Component/TeamsComboBox.cs
+++ b/LongoMatch.GUI/Gui/Component/TeamsComboBox.cs
@@ -17,9 +17,9 @@
 //
 using System;
 using Gtk;
-using LongoMatch.Common;
+using LongoMatch.Core.Common;
 using System.Collections.Generic;
-using LongoMatch.Store.Templates;
+using LongoMatch.Core.Store.Templates;
 using Gdk;
 
 namespace LongoMatch.Gui.Component
diff --git a/LongoMatch.GUI/Gui/Component/TimeScale.cs b/LongoMatch.GUI/Gui/Component/TimeScale.cs
index 7de6257..8a05a82 100644
--- a/LongoMatch.GUI/Gui/Component/TimeScale.cs
+++ b/LongoMatch.GUI/Gui/Component/TimeScale.cs
@@ -27,7 +27,7 @@ using Pango;
 using Mono.Unix;
 using LongoMatch.Common;
 using LongoMatch.Gui.Base;
-using LongoMatch.Handlers;
+using LongoMatch.Core.Handlers;
 using LongoMatch.Store;
 
 
diff --git a/LongoMatch.GUI/Gui/Component/Timeline.cs b/LongoMatch.GUI/Gui/Component/Timeline.cs
index 4020f84..67bafdf 100644
--- a/LongoMatch.GUI/Gui/Component/Timeline.cs
+++ b/LongoMatch.GUI/Gui/Component/Timeline.cs
@@ -17,11 +17,11 @@
 //
 using System;
 using LongoMatch.Drawing.Widgets;
-using LongoMatch.Store;
-using LongoMatch.Handlers;
-using LongoMatch.Common;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Handlers;
+using LongoMatch.Core.Common;
 using System.Collections.Generic;
-using LongoMatch.Interfaces;
+using LongoMatch.Core.Interfaces;
 using LongoMatch.Drawing.Cairo;
 using LongoMatch.Drawing;
 using Gtk;
diff --git a/LongoMatch.GUI/Gui/Component/VideoPreferencesPanel.cs 
b/LongoMatch.GUI/Gui/Component/VideoPreferencesPanel.cs
index 9d41403..1427885 100644
--- a/LongoMatch.GUI/Gui/Component/VideoPreferencesPanel.cs
+++ b/LongoMatch.GUI/Gui/Component/VideoPreferencesPanel.cs
@@ -17,7 +17,7 @@
 //
 using System;
 using Gtk;
-using LongoMatch.Common;
+using LongoMatch.Core.Common;
 using Misc = LongoMatch.Gui.Helpers.Misc;
 
 namespace LongoMatch.Gui.Component
diff --git a/LongoMatch.GUI/Gui/Dialog/About.cs b/LongoMatch.GUI/Gui/Dialog/About.cs
index f046bd7..4b50fac 100644
--- a/LongoMatch.GUI/Gui/Dialog/About.cs
+++ b/LongoMatch.GUI/Gui/Dialog/About.cs
@@ -19,7 +19,7 @@ using System;
 using System.Reflection;
 using Gtk;
 
-using LongoMatch.Common;
+using LongoMatch.Core.Common;
 
 namespace LongoMatch.Gui.Dialog
 {
diff --git a/LongoMatch.GUI/Gui/Dialog/BusyDialog.cs b/LongoMatch.GUI/Gui/Dialog/BusyDialog.cs
index bcfa8d3..7ffc673 100644
--- a/LongoMatch.GUI/Gui/Dialog/BusyDialog.cs
+++ b/LongoMatch.GUI/Gui/Dialog/BusyDialog.cs
@@ -18,7 +18,7 @@
 
 using System;
 
-using LongoMatch.Interfaces.GUI;
+using LongoMatch.Core.Interfaces.GUI;
 
 namespace LongoMatch.Gui.Dialog
 {
diff --git a/LongoMatch.GUI/Gui/Dialog/DatabasesManager.cs b/LongoMatch.GUI/Gui/Dialog/DatabasesManager.cs
index 7ef552c..b85649b 100644
--- a/LongoMatch.GUI/Gui/Dialog/DatabasesManager.cs
+++ b/LongoMatch.GUI/Gui/Dialog/DatabasesManager.cs
@@ -20,7 +20,7 @@ using System.Linq;
 using Gtk;
 using Mono.Unix;
 
-using LongoMatch.Interfaces;
+using LongoMatch.Core.Interfaces;
 using LongoMatch.Gui.Helpers;
 
 namespace LongoMatch.Gui.Dialog
diff --git a/LongoMatch.GUI/Gui/Dialog/DrawingTool.cs b/LongoMatch.GUI/Gui/Dialog/DrawingTool.cs
index c0e1013..5cd0fcc 100644
--- a/LongoMatch.GUI/Gui/Dialog/DrawingTool.cs
+++ b/LongoMatch.GUI/Gui/Dialog/DrawingTool.cs
@@ -20,18 +20,18 @@ using System;
 using Gtk;
 using Mono.Unix;
 
-using LongoMatch.Common;
+using LongoMatch.Core.Common;
 using LongoMatch.Gui.Component;
-using LongoMatch.Store;
+using LongoMatch.Core.Store;
 using LongoMatch.Gui.Helpers;
 using LongoMatch.Drawing.Widgets;
 using LongoMatch.Drawing.Cairo;
-using LongoMatch.Store.Drawables;
-using LongoMatch.Interfaces.Drawing;
+using LongoMatch.Core.Store.Drawables;
+using LongoMatch.Core.Interfaces.Drawing;
 using Misc = LongoMatch.Gui.Helpers.Misc;
-using Color = LongoMatch.Common.Color;
-using Drawable = LongoMatch.Store.Drawables.Drawable;
-using Image = LongoMatch.Common.Image;
+using Color = LongoMatch.Core.Common.Color;
+using Drawable = LongoMatch.Core.Store.Drawables.Drawable;
+using Image = LongoMatch.Core.Common.Image;
 
 namespace LongoMatch.Gui.Dialog
 {
diff --git a/LongoMatch.GUI/Gui/Dialog/EditCategoryDialog.cs b/LongoMatch.GUI/Gui/Dialog/EditCategoryDialog.cs
index bb33f63..f3841b4 100644
--- a/LongoMatch.GUI/Gui/Dialog/EditCategoryDialog.cs
+++ b/LongoMatch.GUI/Gui/Dialog/EditCategoryDialog.cs
@@ -19,7 +19,7 @@
 using System;
 using System.Collections.Generic;
 using LongoMatch.Gui.Helpers;
-using LongoMatch.Store;
+using LongoMatch.Core.Store;
 using Mono.Unix;
 
 namespace LongoMatch.Gui.Dialog
diff --git a/LongoMatch.GUI/Gui/Dialog/EndCaptureDialog.cs b/LongoMatch.GUI/Gui/Dialog/EndCaptureDialog.cs
index 311718f..b4449d0 100644
--- a/LongoMatch.GUI/Gui/Dialog/EndCaptureDialog.cs
+++ b/LongoMatch.GUI/Gui/Dialog/EndCaptureDialog.cs
@@ -17,7 +17,7 @@
 //
 
 using System;
-using LongoMatch.Common;
+using LongoMatch.Core.Common;
 
 namespace LongoMatch.Gui.Dialog
 {
diff --git a/LongoMatch.GUI/Gui/Dialog/FramesCaptureProgressDialog.cs 
b/LongoMatch.GUI/Gui/Dialog/FramesCaptureProgressDialog.cs
index f355548..3433b63 100644
--- a/LongoMatch.GUI/Gui/Dialog/FramesCaptureProgressDialog.cs
+++ b/LongoMatch.GUI/Gui/Dialog/FramesCaptureProgressDialog.cs
@@ -23,7 +23,7 @@ using Gtk;
 using Gdk;
 using Mono.Unix;
 
-using LongoMatch.Handlers;
+using LongoMatch.Core.Handlers;
 using LongoMatch.Video.Utils;
 using LongoMatch.Video.Common;
 
@@ -45,7 +45,7 @@ namespace LongoMatch.Gui.Dialog
                        capturer.Start();
                }
 
-               protected virtual void Update(int actual, int total, LongoMatch.Common.Image frame) {
+               protected virtual void Update(int actual, int total, LongoMatch.Core.Common.Image frame) {
                        if(actual <= total) {
                                progressbar.Text= Catalog.GetString("Capturing frame: ")+actual+"/"+total;
                                progressbar.Fraction = (double)actual/(double)total;
diff --git a/LongoMatch.GUI/Gui/Dialog/HotKeySelectorDialog.cs 
b/LongoMatch.GUI/Gui/Dialog/HotKeySelectorDialog.cs
index 070a16b..424cfb8 100644
--- a/LongoMatch.GUI/Gui/Dialog/HotKeySelectorDialog.cs
+++ b/LongoMatch.GUI/Gui/Dialog/HotKeySelectorDialog.cs
@@ -20,7 +20,7 @@
 using System;
 using Gtk;
 using Gdk;
-using LongoMatch.Store;
+using LongoMatch.Core.Store;
 
 namespace LongoMatch.Gui.Dialog
 {
diff --git a/LongoMatch.GUI/Gui/Dialog/PlayEditor.cs b/LongoMatch.GUI/Gui/Dialog/PlayEditor.cs
index bb23929..c281272 100644
--- a/LongoMatch.GUI/Gui/Dialog/PlayEditor.cs
+++ b/LongoMatch.GUI/Gui/Dialog/PlayEditor.cs
@@ -17,8 +17,8 @@
 //
 using System;
 using System.Linq;
-using LongoMatch.Common;
-using LongoMatch.Store;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Store;
 using LongoMatch.Drawing.Widgets;
 using System.Collections.Generic;
 using LongoMatch.Drawing.Cairo;
diff --git a/LongoMatch.GUI/Gui/Dialog/RenderingJobsDialog.cs 
b/LongoMatch.GUI/Gui/Dialog/RenderingJobsDialog.cs
index f3a86cc..581b9a0 100644
--- a/LongoMatch.GUI/Gui/Dialog/RenderingJobsDialog.cs
+++ b/LongoMatch.GUI/Gui/Dialog/RenderingJobsDialog.cs
@@ -19,8 +19,8 @@ using System;
 using System.Collections.Generic;
 using Gtk;
 
-using LongoMatch.Common;
-using LongoMatch.Interfaces;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Interfaces;
 
 
 namespace LongoMatch.Gui.Dialog
diff --git a/LongoMatch.GUI/Gui/Dialog/SnapshotsDialog.cs b/LongoMatch.GUI/Gui/Dialog/SnapshotsDialog.cs
index 45129c1..72c6aac 100644
--- a/LongoMatch.GUI/Gui/Dialog/SnapshotsDialog.cs
+++ b/LongoMatch.GUI/Gui/Dialog/SnapshotsDialog.cs
@@ -19,8 +19,8 @@
 //
 
 using System;
-using LongoMatch.Store;
-using LongoMatch.Handlers;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Handlers;
 
 namespace LongoMatch.Gui.Dialog
 {
diff --git a/LongoMatch.GUI/Gui/Dialog/StatsViewer.cs b/LongoMatch.GUI/Gui/Dialog/StatsViewer.cs
index 117f959..6d5891a 100644
--- a/LongoMatch.GUI/Gui/Dialog/StatsViewer.cs
+++ b/LongoMatch.GUI/Gui/Dialog/StatsViewer.cs
@@ -16,8 +16,8 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 using System;
-using LongoMatch.Stats;
-using LongoMatch.Store;
+using LongoMatch.Core.Stats;
+using LongoMatch.Core.Store;
 
 namespace LongoMatch.Gui.Dialog
 {
diff --git a/LongoMatch.GUI/Gui/Dialog/VideoConversionTool.cs 
b/LongoMatch.GUI/Gui/Dialog/VideoConversionTool.cs
index b9ec6cc..a26ee43 100644
--- a/LongoMatch.GUI/Gui/Dialog/VideoConversionTool.cs
+++ b/LongoMatch.GUI/Gui/Dialog/VideoConversionTool.cs
@@ -20,11 +20,11 @@ using System.Collections.Generic;
 using Gtk;
 using Mono.Unix;
 
-using LongoMatch.Common;
+using LongoMatch.Core.Common;
 using LongoMatch.Gui;
 using LongoMatch.Video.Utils;
-using LongoMatch.Store;
-using LongoMatch.Interfaces;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Interfaces;
 using LongoMatch.Gui.Helpers;
 
 namespace LongoMatch.Gui.Dialog
diff --git a/LongoMatch.GUI/Gui/Dialog/VideoEditionProperties.cs 
b/LongoMatch.GUI/Gui/Dialog/VideoEditionProperties.cs
index 9310719..2cb061b 100644
--- a/LongoMatch.GUI/Gui/Dialog/VideoEditionProperties.cs
+++ b/LongoMatch.GUI/Gui/Dialog/VideoEditionProperties.cs
@@ -24,7 +24,7 @@ using Gtk;
 using Mono.Unix;
 using LongoMatch.Video.Editor;
 using LongoMatch.Video.Common;
-using LongoMatch.Common;
+using LongoMatch.Core.Common;
 using LongoMatch.Gui.Helpers;
 using Misc = LongoMatch.Gui.Helpers.Misc;
 
diff --git a/LongoMatch.GUI/Gui/GUIToolkit.cs b/LongoMatch.GUI/Gui/GUIToolkit.cs
index 6c635ae..e52087b 100644
--- a/LongoMatch.GUI/Gui/GUIToolkit.cs
+++ b/LongoMatch.GUI/Gui/GUIToolkit.cs
@@ -19,18 +19,18 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using Gtk;
-using LongoMatch.Common;
+using LongoMatch.Core.Common;
 using LongoMatch.Gui.Helpers;
-using LongoMatch.Interfaces.GUI;
-using LongoMatch.Store;
-using LongoMatch.Store.Playlists;
+using LongoMatch.Core.Interfaces.GUI;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Store.Playlists;
 using LongoMatch.Video.Utils;
 using Mono.Unix;
 using LongoMatch.Gui.Component;
 using LongoMatch.Gui.Dialog;
 using LongoMatch.Gui.Panel;
-using Image = LongoMatch.Common.Image;
-using LongoMatch.Interfaces;
+using Image = LongoMatch.Core.Common.Image;
+using LongoMatch.Core.Interfaces;
 
 namespace LongoMatch.Gui
 {
diff --git a/LongoMatch.GUI/Gui/MainWindow.cs b/LongoMatch.GUI/Gui/MainWindow.cs
index d6c6d9b..1583d8b 100644
--- a/LongoMatch.GUI/Gui/MainWindow.cs
+++ b/LongoMatch.GUI/Gui/MainWindow.cs
@@ -26,18 +26,18 @@ using GLib;
 using Gtk;
 using Mono.Unix;
 
-using LongoMatch.Common;
+using LongoMatch.Core.Common;
 using LongoMatch.Gui.Dialog;
-using LongoMatch.Handlers;
-using LongoMatch.Interfaces;
-using LongoMatch.Interfaces.GUI;
-using LongoMatch.Store;
-using LongoMatch.Store.Templates;
+using LongoMatch.Core.Handlers;
+using LongoMatch.Core.Interfaces;
+using LongoMatch.Core.Interfaces.GUI;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Store.Templates;
 using LongoMatch.Video.Common;
 using LongoMatch.Gui.Component;
 using LongoMatch.Gui.Helpers;
 using LongoMatch.Gui.Panel;
-using LongoMatch.Interfaces.Multimedia;
+using LongoMatch.Core.Interfaces.Multimedia;
 
 
 namespace LongoMatch.Gui
diff --git a/LongoMatch.GUI/Gui/Menu/PlaysMenu.cs b/LongoMatch.GUI/Gui/Menu/PlaysMenu.cs
index 9b063cc..cece4c8 100644
--- a/LongoMatch.GUI/Gui/Menu/PlaysMenu.cs
+++ b/LongoMatch.GUI/Gui/Menu/PlaysMenu.cs
@@ -19,9 +19,9 @@ using System;
 using System.Linq;
 using System.Collections.Generic;
 using Gtk;
-using LongoMatch.Interfaces;
-using LongoMatch.Store;
-using LongoMatch.Store.Playlists;
+using LongoMatch.Core.Interfaces;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Store.Playlists;
 using Mono.Unix;
 
 namespace LongoMatch.Gui.Menus
diff --git a/LongoMatch.GUI/Gui/Panel/NewProjectPanel.cs b/LongoMatch.GUI/Gui/Panel/NewProjectPanel.cs
index 9f6cb27..faf9beb 100644
--- a/LongoMatch.GUI/Gui/Panel/NewProjectPanel.cs
+++ b/LongoMatch.GUI/Gui/Panel/NewProjectPanel.cs
@@ -20,16 +20,16 @@ using System.Linq;
 using System.Collections.Generic;
 using Gtk;
 using Gdk;
-using LongoMatch.Handlers;
-using LongoMatch.Interfaces.Multimedia;
-using LongoMatch.Store;
-using LongoMatch.Common;
-using LongoMatch.Store.Templates;
+using LongoMatch.Core.Handlers;
+using LongoMatch.Core.Interfaces.Multimedia;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Store.Templates;
 using Misc = LongoMatch.Gui.Helpers.Misc;
 using Mono.Unix;
 using LongoMatch.Gui.Helpers;
-using LongoMatch.Interfaces.GUI;
-using Device = LongoMatch.Common.Device;
+using LongoMatch.Core.Interfaces.GUI;
+using Device = LongoMatch.Core.Common.Device;
 using Color = Gdk.Color;
 using LongoMatch.Drawing.Widgets;
 using LongoMatch.Drawing.Cairo;
diff --git a/LongoMatch.GUI/Gui/Panel/OpenProjectPanel.cs b/LongoMatch.GUI/Gui/Panel/OpenProjectPanel.cs
index c89b605..035662a 100644
--- a/LongoMatch.GUI/Gui/Panel/OpenProjectPanel.cs
+++ b/LongoMatch.GUI/Gui/Panel/OpenProjectPanel.cs
@@ -18,10 +18,10 @@
 using System;
 using System.Collections.Generic;
 using Gtk;
-using LongoMatch.Handlers;
+using LongoMatch.Core.Handlers;
 using LongoMatch.Gui;
-using LongoMatch.Store;
-using LongoMatch.Interfaces.GUI;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Interfaces.GUI;
 
 namespace LongoMatch.Gui.Panel
 {
diff --git a/LongoMatch.GUI/Gui/Panel/PanelHeader.cs b/LongoMatch.GUI/Gui/Panel/PanelHeader.cs
index a4f4c68..03e7989 100644
--- a/LongoMatch.GUI/Gui/Panel/PanelHeader.cs
+++ b/LongoMatch.GUI/Gui/Panel/PanelHeader.cs
@@ -16,7 +16,7 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 using System;
-using LongoMatch.Common;
+using LongoMatch.Core.Common;
 using Gtk;
 
 namespace LongoMatch.Gui.Panel
diff --git a/LongoMatch.GUI/Gui/Panel/PreferencesPanel.cs b/LongoMatch.GUI/Gui/Panel/PreferencesPanel.cs
index ff090b9..4bd8fda 100644
--- a/LongoMatch.GUI/Gui/Panel/PreferencesPanel.cs
+++ b/LongoMatch.GUI/Gui/Panel/PreferencesPanel.cs
@@ -16,8 +16,8 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 using System;
-using LongoMatch.Interfaces.GUI;
-using LongoMatch.Handlers;
+using LongoMatch.Core.Interfaces.GUI;
+using LongoMatch.Core.Handlers;
 using Mono.Unix;
 using Gtk;
 using LongoMatch.Gui.Component;
diff --git a/LongoMatch.GUI/Gui/Panel/ProjectsManagerPanel.cs 
b/LongoMatch.GUI/Gui/Panel/ProjectsManagerPanel.cs
index 0323a06..7cb32dc 100644
--- a/LongoMatch.GUI/Gui/Panel/ProjectsManagerPanel.cs
+++ b/LongoMatch.GUI/Gui/Panel/ProjectsManagerPanel.cs
@@ -16,16 +16,16 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 using System;
-using LongoMatch.Store;
+using LongoMatch.Core.Store;
 using System.Collections.Generic;
-using LongoMatch.Interfaces;
-using LongoMatch.Store.Templates;
-using LongoMatch.Interfaces.GUI;
-using LongoMatch.Handlers;
+using LongoMatch.Core.Interfaces;
+using LongoMatch.Core.Store.Templates;
+using LongoMatch.Core.Interfaces.GUI;
+using LongoMatch.Core.Handlers;
 using Gtk;
-using LongoMatch.Common;
+using LongoMatch.Core.Common;
 using LongoMatch.Gui.Helpers;
-using LongoMatch.Interfaces.Multimedia;
+using LongoMatch.Core.Interfaces.Multimedia;
 using Mono.Unix;
 using LongoMatch.Video;
 
diff --git a/LongoMatch.GUI/Gui/Panel/SportsTemplatesPanel.cs 
b/LongoMatch.GUI/Gui/Panel/SportsTemplatesPanel.cs
index 712775a..842e57e 100644
--- a/LongoMatch.GUI/Gui/Panel/SportsTemplatesPanel.cs
+++ b/LongoMatch.GUI/Gui/Panel/SportsTemplatesPanel.cs
@@ -16,17 +16,17 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 using System;
-using LongoMatch.Interfaces.GUI;
+using LongoMatch.Core.Interfaces.GUI;
 using Gtk;
 using System.Collections.Generic;
-using LongoMatch.Store.Templates;
-using LongoMatch.Interfaces;
-using LongoMatch.Handlers;
+using LongoMatch.Core.Store.Templates;
+using LongoMatch.Core.Interfaces;
+using LongoMatch.Core.Handlers;
 using Gdk;
 using Mono.Unix;
 using LongoMatch.Gui.Helpers;
 using LongoMatch.Gui.Dialog;
-using LongoMatch.Common;
+using LongoMatch.Core.Common;
 
 namespace LongoMatch.Gui.Panel
 {
diff --git a/LongoMatch.GUI/Gui/Panel/TeamsTemplatesPanel.cs b/LongoMatch.GUI/Gui/Panel/TeamsTemplatesPanel.cs
index 52d66b5..1b98810 100644
--- a/LongoMatch.GUI/Gui/Panel/TeamsTemplatesPanel.cs
+++ b/LongoMatch.GUI/Gui/Panel/TeamsTemplatesPanel.cs
@@ -22,15 +22,15 @@ using Gtk;
 using Mono.Unix;
 using Stetic;
 
-using Image = LongoMatch.Common.Image;
-using LongoMatch.Common;
+using Image = LongoMatch.Core.Common.Image;
+using LongoMatch.Core.Common;
 using LongoMatch.Gui.Dialog;
-using LongoMatch.Interfaces;
-using LongoMatch.Store;
-using LongoMatch.Store.Templates;
+using LongoMatch.Core.Interfaces;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Store.Templates;
 using LongoMatch.Gui.Helpers;
-using LongoMatch.Handlers;
-using LongoMatch.Interfaces.GUI;
+using LongoMatch.Core.Handlers;
+using LongoMatch.Core.Interfaces.GUI;
 
 namespace LongoMatch.Gui.Panel
 {
diff --git a/LongoMatch.GUI/Gui/Panel/WelcomePanel.cs b/LongoMatch.GUI/Gui/Panel/WelcomePanel.cs
index a6be675..2e54b96 100644
--- a/LongoMatch.GUI/Gui/Panel/WelcomePanel.cs
+++ b/LongoMatch.GUI/Gui/Panel/WelcomePanel.cs
@@ -16,8 +16,8 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 using System;
-using LongoMatch.Handlers;
-using LongoMatch.Common;
+using LongoMatch.Core.Handlers;
+using LongoMatch.Core.Common;
 using Mono.Unix;
 using Gtk;
 
diff --git a/LongoMatch.GUI/Gui/Popup/CalendarPopup.cs b/LongoMatch.GUI/Gui/Popup/CalendarPopup.cs
index 240d9a4..b3dbd59 100644
--- a/LongoMatch.GUI/Gui/Popup/CalendarPopup.cs
+++ b/LongoMatch.GUI/Gui/Popup/CalendarPopup.cs
@@ -19,7 +19,7 @@
 //
 
 using System;
-using LongoMatch.Handlers;
+using LongoMatch.Core.Handlers;
 
 namespace LongoMatch.Gui.Popup
 {
diff --git a/LongoMatch.GUI/Gui/TreeView/CategoriesFilterTreeView.cs 
b/LongoMatch.GUI/Gui/TreeView/CategoriesFilterTreeView.cs
index 8b2e835..33a8c21 100644
--- a/LongoMatch.GUI/Gui/TreeView/CategoriesFilterTreeView.cs
+++ b/LongoMatch.GUI/Gui/TreeView/CategoriesFilterTreeView.cs
@@ -19,10 +19,10 @@ using System;
 using Gtk;
 using Mono.Unix;
 
-using LongoMatch.Common;
-using LongoMatch.Interfaces;
-using LongoMatch.Store;
-using LongoMatch.Store.Templates;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Interfaces;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Store.Templates;
 
 namespace LongoMatch.Gui.Component
 {
diff --git a/LongoMatch.GUI/Gui/TreeView/FilterBaseView.cs b/LongoMatch.GUI/Gui/TreeView/FilterBaseView.cs
index 156ee27..45e6041 100644
--- a/LongoMatch.GUI/Gui/TreeView/FilterBaseView.cs
+++ b/LongoMatch.GUI/Gui/TreeView/FilterBaseView.cs
@@ -20,9 +20,9 @@ using Gtk;
 using Gdk;
 using Mono.Unix;
 
-using LongoMatch.Common;
-using LongoMatch.Store;
-using LongoMatch.Store.Templates;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Store.Templates;
 
 namespace LongoMatch.Gui.Component
 {
diff --git a/LongoMatch.GUI/Gui/TreeView/ListTreeViewBase.cs b/LongoMatch.GUI/Gui/TreeView/ListTreeViewBase.cs
index 941fda0..a0f72b8 100644
--- a/LongoMatch.GUI/Gui/TreeView/ListTreeViewBase.cs
+++ b/LongoMatch.GUI/Gui/TreeView/ListTreeViewBase.cs
@@ -23,15 +23,15 @@ using Gdk;
 using Gtk;
 using Mono.Unix;
 
-using LongoMatch.Common;
-using LongoMatch.Store;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Store;
 using LongoMatch.Drawing;
-using Image = LongoMatch.Common.Image;
-using Point = LongoMatch.Common.Point;
+using Image = LongoMatch.Core.Common.Image;
+using Point = LongoMatch.Core.Common.Point;
 using Color = Gdk.Color;
 using LongoMatch.Gui.Menus;
 using LongoMatch.Drawing.Cairo;
-using LongoMatch.Interfaces.Drawing;
+using LongoMatch.Core.Interfaces.Drawing;
 
 namespace LongoMatch.Gui.Component
 {
diff --git a/LongoMatch.GUI/Gui/TreeView/PlayListTreeView.cs b/LongoMatch.GUI/Gui/TreeView/PlayListTreeView.cs
index 03ee024..fbe32d9 100644
--- a/LongoMatch.GUI/Gui/TreeView/PlayListTreeView.cs
+++ b/LongoMatch.GUI/Gui/TreeView/PlayListTreeView.cs
@@ -21,10 +21,10 @@ using System;
 using Gtk;
 using Gdk;
 using Mono.Unix;
-using LongoMatch.Store.Playlists;
-using LongoMatch.Interfaces;
+using LongoMatch.Core.Store.Playlists;
+using LongoMatch.Core.Interfaces;
 using LongoMatch.Gui.Dialog;
-using LongoMatch.Store;
+using LongoMatch.Core.Store;
 
 namespace LongoMatch.Gui.Component
 {
diff --git a/LongoMatch.GUI/Gui/TreeView/PlayersFilterTreeView.cs 
b/LongoMatch.GUI/Gui/TreeView/PlayersFilterTreeView.cs
index 8269869..0ea170d 100644
--- a/LongoMatch.GUI/Gui/TreeView/PlayersFilterTreeView.cs
+++ b/LongoMatch.GUI/Gui/TreeView/PlayersFilterTreeView.cs
@@ -20,9 +20,9 @@ using Gtk;
 using Gdk;
 using Mono.Unix;
 
-using LongoMatch.Common;
-using LongoMatch.Store;
-using LongoMatch.Store.Templates;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Store.Templates;
 
 namespace LongoMatch.Gui.Component
 {
diff --git a/LongoMatch.GUI/Gui/TreeView/PlayersTreeView.cs b/LongoMatch.GUI/Gui/TreeView/PlayersTreeView.cs
index 00b8327..f5127f4 100644
--- a/LongoMatch.GUI/Gui/TreeView/PlayersTreeView.cs
+++ b/LongoMatch.GUI/Gui/TreeView/PlayersTreeView.cs
@@ -18,8 +18,8 @@
 
 using Gdk;
 using Gtk;
-using LongoMatch.Common;
-using LongoMatch.Store;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Store;
 
 namespace LongoMatch.Gui.Component
 {
diff --git a/LongoMatch.GUI/Gui/TreeView/PlaysTreeView.cs b/LongoMatch.GUI/Gui/TreeView/PlaysTreeView.cs
index bb2e8ad..bd089be 100644
--- a/LongoMatch.GUI/Gui/TreeView/PlaysTreeView.cs
+++ b/LongoMatch.GUI/Gui/TreeView/PlaysTreeView.cs
@@ -20,10 +20,10 @@
 
 using System;
 using Gtk;
-using LongoMatch.Common;
-using LongoMatch.Handlers;
-using LongoMatch.Store;
-using EventType = LongoMatch.Store.EventType;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Handlers;
+using LongoMatch.Core.Store;
+using EventType = LongoMatch.Core.Store.EventType;
 
 namespace LongoMatch.Gui.Component
 {
diff --git a/LongoMatch.GUI/Gui/TreeView/RenderingJobsTreeView.cs 
b/LongoMatch.GUI/Gui/TreeView/RenderingJobsTreeView.cs
index c5f920a..5570332 100644
--- a/LongoMatch.GUI/Gui/TreeView/RenderingJobsTreeView.cs
+++ b/LongoMatch.GUI/Gui/TreeView/RenderingJobsTreeView.cs
@@ -20,7 +20,7 @@ using System.Collections.Generic;
 using Gtk;
 using Stetic;
 using Mono.Unix;
-using LongoMatch.Common;
+using LongoMatch.Core.Common;
 
 
 namespace LongoMatch.Gui.Component
diff --git a/LongoMatch.Migration/Common/Color.cs b/LongoMatch.Migration/Common/Color.cs
index 009cbc8..b27eb34 100644
--- a/LongoMatch.Migration/Common/Color.cs
+++ b/LongoMatch.Migration/Common/Color.cs
@@ -18,7 +18,7 @@
 using System;
 using Newtonsoft.Json;
 
-namespace LongoMatch.Common
+namespace LongoMatch.Core.Common
 {
 
        [JsonConverter (typeof (LongoMatchConverter))]
diff --git a/LongoMatch.Migration/Common/Config.cs b/LongoMatch.Migration/Common/Config.cs
index 01d3805..76aeaf5 100644
--- a/LongoMatch.Migration/Common/Config.cs
+++ b/LongoMatch.Migration/Common/Config.cs
@@ -17,7 +17,7 @@
 //
 using System;
 
-namespace LongoMatch.Common
+namespace LongoMatch.Core.Common
 {
        public class Config
        {
diff --git a/LongoMatch.Migration/Common/Constants.cs b/LongoMatch.Migration/Common/Constants.cs
index f51aa74..396980e 100644
--- a/LongoMatch.Migration/Common/Constants.cs
+++ b/LongoMatch.Migration/Common/Constants.cs
@@ -22,7 +22,7 @@ using Gdk;
 #endif
 
 
-namespace LongoMatch.Common
+namespace LongoMatch.Core.Common
 {
        public class Constants {
                public const string SOFTWARE_NAME = "LongoMatch";
diff --git a/LongoMatch.Migration/Common/Enums.cs b/LongoMatch.Migration/Common/Enums.cs
index ae62c2b..006c180 100644
--- a/LongoMatch.Migration/Common/Enums.cs
+++ b/LongoMatch.Migration/Common/Enums.cs
@@ -17,7 +17,7 @@
 //
 using System;
 
-namespace LongoMatch.Common
+namespace LongoMatch.Core.Common
 {
        public enum Team {
                NONE = 0,
diff --git a/LongoMatch.Migration/Common/Image.cs b/LongoMatch.Migration/Common/Image.cs
index 483c2a1..455cb46 100644
--- a/LongoMatch.Migration/Common/Image.cs
+++ b/LongoMatch.Migration/Common/Image.cs
@@ -18,7 +18,7 @@
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 
-namespace LongoMatch.Common
+namespace LongoMatch.Core.Common
 {
        using System;
        using System.IO;
diff --git a/LongoMatch.Migration/Common/SerializableObject.cs 
b/LongoMatch.Migration/Common/SerializableObject.cs
index c7060be..5aeb297 100644
--- a/LongoMatch.Migration/Common/SerializableObject.cs
+++ b/LongoMatch.Migration/Common/SerializableObject.cs
@@ -23,14 +23,14 @@ using System.Runtime.Serialization.Formatters.Binary;
 using System.Xml.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
-using LongoMatch.Interfaces;
+using LongoMatch.Core.Interfaces;
 using System.Reflection;
-using LongoMatch.Store.Templates;
+using LongoMatch.Core.Store.Templates;
 using Newtonsoft.Json.Converters;
-using LongoMatch.Store;
+using LongoMatch.Core.Store;
 using System.Globalization;
 
-namespace LongoMatch.Common
+namespace LongoMatch.Core.Common
 {
        public class SerializableObject
        {
diff --git a/LongoMatch.Migration/Converter.cs b/LongoMatch.Migration/Converter.cs
index 591efb8..4bb9b27 100644
--- a/LongoMatch.Migration/Converter.cs
+++ b/LongoMatch.Migration/Converter.cs
@@ -18,12 +18,12 @@
 using System;
 using System.Linq;
 using System.IO;
-using LongoMatch.Common;
-using LongoMatch.Store.Templates;
-using LongoMatch.Store;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Store.Templates;
+using LongoMatch.Core.Store;
 using System.Collections.Generic;
 using LongoMatch.DB;
-using LongoMatch.Interfaces;
+using LongoMatch.Core.Interfaces;
 
 namespace LongoMatch.Migration
 {
diff --git a/LongoMatch.Migration/Core/Category.cs b/LongoMatch.Migration/Core/Category.cs
index aeac71c..8bb8f17 100644
--- a/LongoMatch.Migration/Core/Category.cs
+++ b/LongoMatch.Migration/Core/Category.cs
@@ -25,11 +25,11 @@ using System.Runtime.Serialization;
 using Mono.Unix;
 using Newtonsoft.Json;
 
-using LongoMatch.Common;
-using LongoMatch.Interfaces;
-using Image = LongoMatch.Common.Image;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Interfaces;
+using Image = LongoMatch.Core.Common.Image;
 
-namespace LongoMatch.Store
+namespace LongoMatch.Core.Store
 {
 
        /// <summary>
@@ -185,10 +185,10 @@ namespace LongoMatch.Store
                        Position = (Int32) info.GetValue("position", typeof (Int32));
                        SortMethod = (SortMethodType)info.GetValue("sort_method", typeof(SortMethodType));
                        Color = System.Drawing.Color.FromArgb(
-                               LongoMatch.Common.Color.UShortToByte((ushort)info.GetValue("red", 
typeof(ushort))),
-                               LongoMatch.Common.Color.UShortToByte((ushort)info.GetValue("green", 
typeof(ushort))),
-                               LongoMatch.Common.Color.UShortToByte((ushort)info.GetValue("blue", 
typeof(ushort))));
-                       LColor = LongoMatch.Common.Color.ColorFromUShort ((ushort)info.GetValue("red", 
typeof(ushort)),
+                               LongoMatch.Core.Common.Color.UShortToByte((ushort)info.GetValue("red", 
typeof(ushort))),
+                               LongoMatch.Core.Common.Color.UShortToByte((ushort)info.GetValue("green", 
typeof(ushort))),
+                               LongoMatch.Core.Common.Color.UShortToByte((ushort)info.GetValue("blue", 
typeof(ushort))));
+                       LColor = LongoMatch.Core.Common.Color.ColorFromUShort ((ushort)info.GetValue("red", 
typeof(ushort)),
                                                                          (ushort)info.GetValue("green", 
typeof(ushort)),
                                                                          (ushort)info.GetValue("blue", 
typeof(ushort)));
                        try {
diff --git a/LongoMatch.Migration/Core/Coordinates.cs b/LongoMatch.Migration/Core/Coordinates.cs
index dfd8422..62f8a6a 100644
--- a/LongoMatch.Migration/Core/Coordinates.cs
+++ b/LongoMatch.Migration/Core/Coordinates.cs
@@ -20,7 +20,7 @@ using System.Linq;
 using System.Collections.Generic;
 using Newtonsoft.Json;
 
-namespace LongoMatch.Common
+namespace LongoMatch.Core.Common
 {
        [Serializable]
        [JsonObject]
diff --git a/LongoMatch.Migration/Core/Drawing.cs b/LongoMatch.Migration/Core/Drawing.cs
index 96bcb0d..3dba084 100644
--- a/LongoMatch.Migration/Core/Drawing.cs
+++ b/LongoMatch.Migration/Core/Drawing.cs
@@ -19,9 +19,9 @@
 using System;
 using Newtonsoft.Json;
 
-using LongoMatch.Common;
+using LongoMatch.Core.Common;
 
-namespace LongoMatch.Store
+namespace LongoMatch.Core.Store
 {
 
        [Serializable]
diff --git a/LongoMatch.Migration/Core/GameUnit.cs b/LongoMatch.Migration/Core/GameUnit.cs
index f9ce9b9..2a394aa 100644
--- a/LongoMatch.Migration/Core/GameUnit.cs
+++ b/LongoMatch.Migration/Core/GameUnit.cs
@@ -18,7 +18,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace LongoMatch.Store
+namespace LongoMatch.Core.Store
 {
        [Serializable]
        public class GameUnit: List<TimelineNode>
diff --git a/LongoMatch.Migration/Core/GameUnitsList.cs b/LongoMatch.Migration/Core/GameUnitsList.cs
index 4cb7c4a..1cf4689 100644
--- a/LongoMatch.Migration/Core/GameUnitsList.cs
+++ b/LongoMatch.Migration/Core/GameUnitsList.cs
@@ -18,9 +18,9 @@
 using System;
 using System.Collections.Generic;
 
-using LongoMatch.Store;
+using LongoMatch.Core.Store;
 
-namespace LongoMatch.Store
+namespace LongoMatch.Core.Store
 {
        [Serializable]
        public class GameUnitsList: List<GameUnit>
diff --git a/LongoMatch.Migration/Core/HotKey.cs b/LongoMatch.Migration/Core/HotKey.cs
index 3f88f70..b9521dd 100644
--- a/LongoMatch.Migration/Core/HotKey.cs
+++ b/LongoMatch.Migration/Core/HotKey.cs
@@ -24,7 +24,7 @@ using System;
 using System.Collections.Generic;
 using System.Runtime.Serialization;
 using Mono.Unix;
-using LongoMatch.Common;
+using LongoMatch.Core.Common;
 using Newtonsoft.Json;
 
 
@@ -32,7 +32,7 @@ using Newtonsoft.Json;
 using Gdk;
 #endif
 
-namespace LongoMatch.Store
+namespace LongoMatch.Core.Store
 {
 
        /// <summary>
diff --git a/LongoMatch.Migration/Core/Interfaces/ISubCategory.cs 
b/LongoMatch.Migration/Core/Interfaces/ISubCategory.cs
index 15ffd16..376b7c1 100644
--- a/LongoMatch.Migration/Core/Interfaces/ISubCategory.cs
+++ b/LongoMatch.Migration/Core/Interfaces/ISubCategory.cs
@@ -18,7 +18,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace LongoMatch.Interfaces
+namespace LongoMatch.Core.Interfaces
 {
        public interface ISubCategory
        {
diff --git a/LongoMatch.Migration/Core/Interfaces/ITag.cs b/LongoMatch.Migration/Core/Interfaces/ITag.cs
index 90c3e0a..a5725d5 100644
--- a/LongoMatch.Migration/Core/Interfaces/ITag.cs
+++ b/LongoMatch.Migration/Core/Interfaces/ITag.cs
@@ -16,9 +16,9 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 // 
 using System;
-using LongoMatch.Store;
+using LongoMatch.Core.Store;
 
-namespace LongoMatch.Interfaces
+namespace LongoMatch.Core.Interfaces
 {
        public interface ITag<T>
        {
diff --git a/LongoMatch.Migration/Core/Interfaces/ITemplates.cs 
b/LongoMatch.Migration/Core/Interfaces/ITemplates.cs
index a6d17c9..f833e7d 100644
--- a/LongoMatch.Migration/Core/Interfaces/ITemplates.cs
+++ b/LongoMatch.Migration/Core/Interfaces/ITemplates.cs
@@ -17,10 +17,10 @@
 // 
 using System;
 using System.Collections.Generic;
-using LongoMatch.Store;
-using LongoMatch.Store.Templates;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Store.Templates;
        
-namespace LongoMatch.Interfaces
+namespace LongoMatch.Core.Interfaces
 {
        public interface ITemplate
        {
diff --git a/LongoMatch.Migration/Core/Interfaces/ITimelineNode.cs 
b/LongoMatch.Migration/Core/Interfaces/ITimelineNode.cs
index d0ff33d..ebcf925 100644
--- a/LongoMatch.Migration/Core/Interfaces/ITimelineNode.cs
+++ b/LongoMatch.Migration/Core/Interfaces/ITimelineNode.cs
@@ -16,9 +16,9 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 // 
 using System;
-using LongoMatch.Store;
+using LongoMatch.Core.Store;
 
-namespace LongoMatch.Interfaces
+namespace LongoMatch.Core.Interfaces
 {
        public interface ITimelineNode
        {       
diff --git a/LongoMatch.Migration/Core/MediaFile.cs b/LongoMatch.Migration/Core/MediaFile.cs
index 0d05cef..4751a24 100644
--- a/LongoMatch.Migration/Core/MediaFile.cs
+++ b/LongoMatch.Migration/Core/MediaFile.cs
@@ -21,10 +21,10 @@
 using System;
 using Mono.Unix;
 
-using LongoMatch.Common;
+using LongoMatch.Core.Common;
 using Newtonsoft.Json;
 
-namespace LongoMatch.Store
+namespace LongoMatch.Core.Store
 {
 
        [Serializable]
diff --git a/LongoMatch.Migration/Core/Period.cs b/LongoMatch.Migration/Core/Period.cs
index 215f6cf..c2a2ecc 100644
--- a/LongoMatch.Migration/Core/Period.cs
+++ b/LongoMatch.Migration/Core/Period.cs
@@ -19,7 +19,7 @@ using System;
 using System.Linq;
 using System.Collections.Generic;
 
-namespace LongoMatch.Store
+namespace LongoMatch.Core.Store
 {
        public class Period: Timer
        {
diff --git a/LongoMatch.Migration/Core/PixbufTimeNode.cs b/LongoMatch.Migration/Core/PixbufTimeNode.cs
index 5902f3f..8251028 100644
--- a/LongoMatch.Migration/Core/PixbufTimeNode.cs
+++ b/LongoMatch.Migration/Core/PixbufTimeNode.cs
@@ -21,9 +21,9 @@
 using System;
 using System.IO;
 
-using LongoMatch.Common;
+using LongoMatch.Core.Common;
 
-namespace LongoMatch.Store
+namespace LongoMatch.Core.Store
 {
 
        /// <summary>
diff --git a/LongoMatch.Migration/Core/Play.cs b/LongoMatch.Migration/Core/Play.cs
index 74a603c..8907ced 100644
--- a/LongoMatch.Migration/Core/Play.cs
+++ b/LongoMatch.Migration/Core/Play.cs
@@ -22,11 +22,11 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Mono.Unix;
-using LongoMatch.Common;
-using LongoMatch.Interfaces;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Interfaces;
 using Newtonsoft.Json;
 
-namespace LongoMatch.Store
+namespace LongoMatch.Core.Store
 {
 
        /// <summary>
diff --git a/LongoMatch.Migration/Core/PlayListPlay.cs b/LongoMatch.Migration/Core/PlayListPlay.cs
index eca7f57..97c71b9 100644
--- a/LongoMatch.Migration/Core/PlayListPlay.cs
+++ b/LongoMatch.Migration/Core/PlayListPlay.cs
@@ -21,7 +21,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace LongoMatch.Store
+namespace LongoMatch.Core.Store
 {
        /// <summary>
        /// Represents a video segment used by <see cref="LongoMatch.Playlist.Playlist"/>.
diff --git a/LongoMatch.Migration/Core/Player.cs b/LongoMatch.Migration/Core/Player.cs
index 5a1704a..c16b0e7 100644
--- a/LongoMatch.Migration/Core/Player.cs
+++ b/LongoMatch.Migration/Core/Player.cs
@@ -17,10 +17,10 @@
 //
 
 using System;
-using LongoMatch.Common;
+using LongoMatch.Core.Common;
 using Newtonsoft.Json;
 
-namespace LongoMatch.Store
+namespace LongoMatch.Core.Store
 {
        /// <summary>
        /// Player of a team
diff --git a/LongoMatch.Migration/Core/Point.cs b/LongoMatch.Migration/Core/Point.cs
index 45447b6..6986a8f 100644
--- a/LongoMatch.Migration/Core/Point.cs
+++ b/LongoMatch.Migration/Core/Point.cs
@@ -20,7 +20,7 @@ using System;
 using System.Collections.Generic;
 using Newtonsoft.Json;
 
-namespace LongoMatch.Common
+namespace LongoMatch.Core.Common
 {
        
        [Serializable]
diff --git a/LongoMatch.Migration/Core/Project.cs b/LongoMatch.Migration/Core/Project.cs
index 98d671b..1b6a75d 100644
--- a/LongoMatch.Migration/Core/Project.cs
+++ b/LongoMatch.Migration/Core/Project.cs
@@ -25,12 +25,12 @@ using System.Linq;
 using Newtonsoft.Json;
 using Mono.Unix;
 
-using LongoMatch.Common;
-using LongoMatch.Interfaces;
-using LongoMatch.Store;
-using LongoMatch.Store.Templates;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Interfaces;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Store.Templates;
 
-namespace LongoMatch.Store
+namespace LongoMatch.Core.Store
 {
 
        /// <summary>
diff --git a/LongoMatch.Migration/Core/ProjectDescription.cs b/LongoMatch.Migration/Core/ProjectDescription.cs
index 1a6dd9f..949a805 100644
--- a/LongoMatch.Migration/Core/ProjectDescription.cs
+++ b/LongoMatch.Migration/Core/ProjectDescription.cs
@@ -18,9 +18,9 @@
 
 using System;
 using Newtonsoft.Json;
-using LongoMatch.Store;
+using LongoMatch.Core.Store;
 
-namespace LongoMatch.Store
+namespace LongoMatch.Core.Store
 {
 
        /// <summary>
diff --git a/LongoMatch.Migration/Core/SubCategory.cs b/LongoMatch.Migration/Core/SubCategory.cs
index 2a712c3..f44d52f 100644
--- a/LongoMatch.Migration/Core/SubCategory.cs
+++ b/LongoMatch.Migration/Core/SubCategory.cs
@@ -21,10 +21,10 @@ using System.Linq;
 using Mono.Unix;
 using Newtonsoft.Json;
 
-using LongoMatch.Common;
-using LongoMatch.Interfaces;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Interfaces;
 
-namespace LongoMatch.Store
+namespace LongoMatch.Core.Store
 {
        /// <summary>
        /// A sub category is used to extend the tags of a category.
diff --git a/LongoMatch.Migration/Core/Tag.cs b/LongoMatch.Migration/Core/Tag.cs
index e33f344..fed2ce9 100644
--- a/LongoMatch.Migration/Core/Tag.cs
+++ b/LongoMatch.Migration/Core/Tag.cs
@@ -20,10 +20,10 @@ using System;
 using System.Linq;
 using System.Collections.Generic;
 
-using LongoMatch.Common;
-using LongoMatch.Interfaces;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Interfaces;
 
-namespace LongoMatch.Store
+namespace LongoMatch.Core.Store
 {
 [Serializable]
        
diff --git a/LongoMatch.Migration/Core/TagStore.cs b/LongoMatch.Migration/Core/TagStore.cs
index 92d8323..1db28bc 100644
--- a/LongoMatch.Migration/Core/TagStore.cs
+++ b/LongoMatch.Migration/Core/TagStore.cs
@@ -20,11 +20,11 @@ using System.Collections.Generic;
 using System.Linq;
 using Newtonsoft.Json;
 
-using LongoMatch.Common;
-using LongoMatch.Interfaces;
-using LongoMatch.Store;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Interfaces;
+using LongoMatch.Core.Store;
 
-namespace LongoMatch.Store
+namespace LongoMatch.Core.Store
 {
        [Serializable]
        [JsonObject (MemberSerialization = MemberSerialization.OptIn)]
diff --git a/LongoMatch.Migration/Core/Templates/CategoriesTemplate.cs 
b/LongoMatch.Migration/Core/Templates/CategoriesTemplate.cs
index 682e5d5..627e354 100644
--- a/LongoMatch.Migration/Core/Templates/CategoriesTemplate.cs
+++ b/LongoMatch.Migration/Core/Templates/CategoriesTemplate.cs
@@ -23,12 +23,12 @@ using System.Linq;
 using Newtonsoft.Json;
 
 using Mono.Unix;
-using LongoMatch.Common;
-using LongoMatch.Interfaces;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Interfaces;
 
-using Image = LongoMatch.Common.Image;
+using Image = LongoMatch.Core.Common.Image;
 
-namespace LongoMatch.Store.Templates
+namespace LongoMatch.Core.Store.Templates
 {
 
        /// <summary>
diff --git a/LongoMatch.Migration/Core/Templates/SubCategoryTemplate.cs 
b/LongoMatch.Migration/Core/Templates/SubCategoryTemplate.cs
index 4b0fef4..6c727e1 100644
--- a/LongoMatch.Migration/Core/Templates/SubCategoryTemplate.cs
+++ b/LongoMatch.Migration/Core/Templates/SubCategoryTemplate.cs
@@ -18,12 +18,12 @@
 
 using System;
 using System.Collections.Generic;
-using LongoMatch.Common;
-using LongoMatch.Interfaces;
-using LongoMatch.Store;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Interfaces;
+using LongoMatch.Core.Store;
 using Newtonsoft.Json;
 
-namespace LongoMatch.Store.Templates
+namespace LongoMatch.Core.Store.Templates
 {
 
        [Serializable]
diff --git a/LongoMatch.Migration/Core/Templates/TeamTemplate.cs 
b/LongoMatch.Migration/Core/Templates/TeamTemplate.cs
index 8904ab3..1481f83 100644
--- a/LongoMatch.Migration/Core/Templates/TeamTemplate.cs
+++ b/LongoMatch.Migration/Core/Templates/TeamTemplate.cs
@@ -22,10 +22,10 @@ using System.Linq;
 using Mono.Unix;
 using Newtonsoft.Json;
 
-using LongoMatch.Common;
-using LongoMatch.Interfaces;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Interfaces;
 
-namespace LongoMatch.Store.Templates
+namespace LongoMatch.Core.Store.Templates
 {
        [Serializable]
        [JsonObject]
diff --git a/LongoMatch.Migration/Core/Time.cs b/LongoMatch.Migration/Core/Time.cs
index 10d17dc..e2710f4 100644
--- a/LongoMatch.Migration/Core/Time.cs
+++ b/LongoMatch.Migration/Core/Time.cs
@@ -20,9 +20,9 @@
 
 using System;
 using Newtonsoft.Json;
-using LongoMatch.Common;
+using LongoMatch.Core.Common;
 
-namespace LongoMatch.Store
+namespace LongoMatch.Core.Store
 {
 
        /// <summary>
diff --git a/LongoMatch.Migration/Core/TimeNode.cs b/LongoMatch.Migration/Core/TimeNode.cs
index 36267f9..9dabe55 100644
--- a/LongoMatch.Migration/Core/TimeNode.cs
+++ b/LongoMatch.Migration/Core/TimeNode.cs
@@ -21,9 +21,9 @@
 using System;
 using System.Collections.Generic;
 using Newtonsoft.Json;
-using LongoMatch.Store;
+using LongoMatch.Core.Store;
 
-namespace LongoMatch.Store
+namespace LongoMatch.Core.Store
 {
 
        /// <summary>
diff --git a/LongoMatch.Migration/Core/TimelineNode.cs b/LongoMatch.Migration/Core/TimelineNode.cs
index e85e7c5..5dbad8e 100644
--- a/LongoMatch.Migration/Core/TimelineNode.cs
+++ b/LongoMatch.Migration/Core/TimelineNode.cs
@@ -17,9 +17,9 @@
 // 
 using System;
 using Newtonsoft.Json;
-using LongoMatch.Interfaces;
+using LongoMatch.Core.Interfaces;
 
-namespace LongoMatch.Store
+namespace LongoMatch.Core.Store
 {
     /* FIXME: Code duplicated from Play, unfortunately we can't
       * modify the class hierachy */
diff --git a/LongoMatch.Migration/Core/Timer.cs b/LongoMatch.Migration/Core/Timer.cs
index ee28aac..6e4099c 100644
--- a/LongoMatch.Migration/Core/Timer.cs
+++ b/LongoMatch.Migration/Core/Timer.cs
@@ -17,11 +17,11 @@
 //
 using System;
 using System.Linq;
-using LongoMatch.Store;
+using LongoMatch.Core.Store;
 using System.Collections.Generic;
 using Newtonsoft.Json;
 
-namespace LongoMatch.Store
+namespace LongoMatch.Core.Store
 {
        public class Timer
        {
diff --git a/LongoMatch.Migration/DataBase.cs b/LongoMatch.Migration/DataBase.cs
index fe25686..434f3cd 100644
--- a/LongoMatch.Migration/DataBase.cs
+++ b/LongoMatch.Migration/DataBase.cs
@@ -26,10 +26,10 @@ using Db4objects.Db4o;
 using Db4objects.Db4o.Query;
 using Db4objects.Db4o.Ext;
 
-using LongoMatch.Common;
-using LongoMatch.Interfaces;
-using LongoMatch.Store;
-using LongoMatch.Store.Templates;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Interfaces;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Store.Templates;
 
 namespace LongoMatch.DB
 {
diff --git a/LongoMatch.Migration/MainWindow.cs b/LongoMatch.Migration/MainWindow.cs
index b760de7..e20fb08 100644
--- a/LongoMatch.Migration/MainWindow.cs
+++ b/LongoMatch.Migration/MainWindow.cs
@@ -20,7 +20,7 @@ using System.IO;
 using Gtk;
 using System.Collections.Generic;
 using LongoMatch.DB;
-using LongoMatch.Store;
+using LongoMatch.Core.Store;
 
 public partial class MainWindow: Gtk.Window
 {      
diff --git a/LongoMatch.Migration/Tests/CateogiresTest.cs b/LongoMatch.Migration/Tests/CateogiresTest.cs
index cc65853..2f0ebde 100644
--- a/LongoMatch.Migration/Tests/CateogiresTest.cs
+++ b/LongoMatch.Migration/Tests/CateogiresTest.cs
@@ -18,8 +18,8 @@
 using NUnit.Framework;
 using System;
 using System.Reflection;
-using LongoMatch.Store.Templates;
-using LongoMatch.Common;
+using LongoMatch.Core.Store.Templates;
+using LongoMatch.Core.Common;
 using System.IO;
 
 namespace LongoMatch.Migration.Tests
diff --git a/LongoMatch.Migration/Tests/TestProject.cs b/LongoMatch.Migration/Tests/TestProject.cs
index c4a7d88..4e88e03 100644
--- a/LongoMatch.Migration/Tests/TestProject.cs
+++ b/LongoMatch.Migration/Tests/TestProject.cs
@@ -19,8 +19,8 @@ using NUnit.Framework;
 using System;
 using System.Reflection;
 using System.IO;
-using LongoMatch.Store;
-using LongoMatch.Common;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Common;
 
 namespace LongoMatch.Migration.Tests
 {
diff --git a/LongoMatch.Migration/Tests/TestTeam.cs b/LongoMatch.Migration/Tests/TestTeam.cs
index 0829d55..dfba16a 100644
--- a/LongoMatch.Migration/Tests/TestTeam.cs
+++ b/LongoMatch.Migration/Tests/TestTeam.cs
@@ -19,8 +19,8 @@ using NUnit.Framework;
 using System;
 using System.Reflection;
 using System.IO;
-using LongoMatch.Store.Templates;
-using LongoMatch.Common;
+using LongoMatch.Core.Store.Templates;
+using LongoMatch.Core.Common;
 
 namespace LongoMatch.Migration.Tests
 {
diff --git a/LongoMatch.Multimedia/Capturer/FakeCapturer.cs b/LongoMatch.Multimedia/Capturer/FakeCapturer.cs
index ac58b5a..b016459 100644
--- a/LongoMatch.Multimedia/Capturer/FakeCapturer.cs
+++ b/LongoMatch.Multimedia/Capturer/FakeCapturer.cs
@@ -16,12 +16,12 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 using System;
-using LongoMatch.Common;
-using LongoMatch.Handlers;
-using LongoMatch.Interfaces.Multimedia;
-using LongoMatch.Store;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Handlers;
+using LongoMatch.Core.Interfaces.Multimedia;
+using LongoMatch.Core.Store;
 using Mono.Unix;
-using Image = LongoMatch.Common.Image;
+using Image = LongoMatch.Core.Common.Image;
 
 namespace LongoMatch.Video.Capturer
 {
diff --git a/LongoMatch.Multimedia/Capturer/GstCameraCapturer.cs 
b/LongoMatch.Multimedia/Capturer/GstCameraCapturer.cs
index e0fe8ff..7512934 100644
--- a/LongoMatch.Multimedia/Capturer/GstCameraCapturer.cs
+++ b/LongoMatch.Multimedia/Capturer/GstCameraCapturer.cs
@@ -23,11 +23,11 @@ using System.Runtime.InteropServices;
 using Mono.Unix;
 using GLib;
 
-using LongoMatch.Common;
-using LongoMatch.Interfaces.Multimedia;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Interfaces.Multimedia;
 using LongoMatch.Video.Common;
-using LongoMatch.Store;
-using LongoMatch.Handlers;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Handlers;
 
 namespace LongoMatch.Video.Capturer {
 
diff --git a/LongoMatch.Multimedia/Capturer/LiveSourceTimer.cs 
b/LongoMatch.Multimedia/Capturer/LiveSourceTimer.cs
index 32464a6..389a353 100644
--- a/LongoMatch.Multimedia/Capturer/LiveSourceTimer.cs
+++ b/LongoMatch.Multimedia/Capturer/LiveSourceTimer.cs
@@ -16,8 +16,8 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 using System;
-using LongoMatch.Handlers;
-using LongoMatch.Store;
+using LongoMatch.Core.Handlers;
+using LongoMatch.Core.Store;
 
 namespace LongoMatch.Video.Capturer
 {
diff --git a/LongoMatch.Multimedia/Common/Handlers.cs b/LongoMatch.Multimedia/Common/Handlers.cs
index c0b3a72..6ac8be0 100644
--- a/LongoMatch.Multimedia/Common/Handlers.cs
+++ b/LongoMatch.Multimedia/Common/Handlers.cs
@@ -15,8 +15,8 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
-using LongoMatch.Store;
-using LongoMatch.Common;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Common;
 
 namespace LongoMatch.Video.Common
 {
diff --git a/LongoMatch.Multimedia/Converter/GstVideoConverter.cs 
b/LongoMatch.Multimedia/Converter/GstVideoConverter.cs
index 831a217..c491e48 100644
--- a/LongoMatch.Multimedia/Converter/GstVideoConverter.cs
+++ b/LongoMatch.Multimedia/Converter/GstVideoConverter.cs
@@ -15,21 +15,21 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 //
-using LongoMatch.Common;
+using LongoMatch.Core.Common;
 
 namespace LongoMatch.Video.Converter {
 
        using System;
        using System.Runtime.InteropServices;
-       using LongoMatch.Interfaces.Multimedia;
+       using LongoMatch.Core.Interfaces.Multimedia;
        using LongoMatch.Video.Common;
        
 
        #region Autogenerated code
        public  class GstVideoConverter: GLib.Object, IVideoConverter {
        
-               public event LongoMatch.Handlers.ProgressHandler Progress;
-               public event LongoMatch.Handlers.ErrorHandler Error;
+               public event LongoMatch.Core.Handlers.ProgressHandler Progress;
+               public event LongoMatch.Core.Handlers.ErrorHandler Error;
 
                [DllImport("libcesarplayer.dll")]
                static extern unsafe IntPtr gst_video_encoder_new(IntPtr filename, out IntPtr err);
diff --git a/LongoMatch.Multimedia/Editor/GstVideoSplitter.cs 
b/LongoMatch.Multimedia/Editor/GstVideoSplitter.cs
index 5844bb9..d3ae8c2 100644
--- a/LongoMatch.Multimedia/Editor/GstVideoSplitter.cs
+++ b/LongoMatch.Multimedia/Editor/GstVideoSplitter.cs
@@ -22,9 +22,9 @@ namespace LongoMatch.Video.Editor
        using System;
        using System.Collections;
        using System.Runtime.InteropServices;
-       using LongoMatch.Interfaces;
-       using LongoMatch.Common;
-       using LongoMatch.Interfaces.Multimedia;
+       using LongoMatch.Core.Interfaces;
+       using LongoMatch.Core.Common;
+       using LongoMatch.Core.Interfaces.Multimedia;
        using LongoMatch.Video.Common;
 
        public class GstVideoSplitter : GLib.Object, IVideoEditor
@@ -33,8 +33,8 @@ namespace LongoMatch.Video.Editor
                [DllImport("libcesarplayer.dll")]
                static extern unsafe IntPtr gst_video_editor_new (out IntPtr err);
 
-               public event LongoMatch.Handlers.ProgressHandler Progress;
-               public event LongoMatch.Handlers.ErrorHandler Error;
+               public event LongoMatch.Core.Handlers.ProgressHandler Progress;
+               public event LongoMatch.Core.Handlers.ErrorHandler Error;
 
                public unsafe GstVideoSplitter () : base(IntPtr.Zero)
                {
diff --git a/LongoMatch.Multimedia/Player/GstPlayer.cs b/LongoMatch.Multimedia/Player/GstPlayer.cs
index d395e35..fc9a4ea 100644
--- a/LongoMatch.Multimedia/Player/GstPlayer.cs
+++ b/LongoMatch.Multimedia/Player/GstPlayer.cs
@@ -18,12 +18,12 @@
 using System;
 using System.Collections;
 using System.Runtime.InteropServices;
-using LongoMatch.Interfaces.Multimedia;
+using LongoMatch.Core.Interfaces.Multimedia;
 using LongoMatch.Video.Common;
 using LongoMatch.Video.Utils;
-using LongoMatch.Store;
-using LongoMatch.Common;
-using LongoMatch.Handlers;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Handlers;
 
 namespace LongoMatch.Video.Player
 {
diff --git a/LongoMatch.Multimedia/Remuxer/GstRemuxer.cs b/LongoMatch.Multimedia/Remuxer/GstRemuxer.cs
index 8106e56..91c46fd 100644
--- a/LongoMatch.Multimedia/Remuxer/GstRemuxer.cs
+++ b/LongoMatch.Multimedia/Remuxer/GstRemuxer.cs
@@ -20,16 +20,16 @@ namespace LongoMatch.Video.Remuxer
        using System;
        using System.Runtime.InteropServices;
        using Mono.Unix;
-       using LongoMatch.Common;
+       using LongoMatch.Core.Common;
        using LongoMatch.Video.Common;
-       using LongoMatch.Interfaces.Multimedia;
+       using LongoMatch.Core.Interfaces.Multimedia;
 
        #region Autogenerated code
        public  class GstRemuxer : GLib.Object, IRemuxer
        {
 
-               public event LongoMatch.Handlers.ProgressHandler Progress;
-               public event LongoMatch.Handlers.ErrorHandler Error;
+               public event LongoMatch.Core.Handlers.ProgressHandler Progress;
+               public event LongoMatch.Core.Handlers.ErrorHandler Error;
 
                [DllImport("libcesarplayer.dll")]
                static extern unsafe IntPtr gst_remuxer_new (IntPtr input_file, IntPtr output_file, 
VideoMuxerType muxer, out IntPtr err);
diff --git a/LongoMatch.Multimedia/Remuxer/MpegRemuxer.cs b/LongoMatch.Multimedia/Remuxer/MpegRemuxer.cs
index 5d986de..3c37fa1 100644
--- a/LongoMatch.Multimedia/Remuxer/MpegRemuxer.cs
+++ b/LongoMatch.Multimedia/Remuxer/MpegRemuxer.cs
@@ -19,8 +19,8 @@ using System;
 using System.Diagnostics;
 using System.IO;
 using System.Threading;
-using LongoMatch.Handlers;
-using LongoMatch.Interfaces.Multimedia;
+using LongoMatch.Core.Handlers;
+using LongoMatch.Core.Interfaces.Multimedia;
 
 namespace LongoMatch.Video.Remuxer
 {
diff --git a/LongoMatch.Multimedia/Utils/GStreamer.cs b/LongoMatch.Multimedia/Utils/GStreamer.cs
index b8568be..dd63571 100644
--- a/LongoMatch.Multimedia/Utils/GStreamer.cs
+++ b/LongoMatch.Multimedia/Utils/GStreamer.cs
@@ -18,8 +18,9 @@
 using System;
 using System.IO;
 using System.Runtime.InteropServices;
-using LongoMatch.Store;
+using LongoMatch.Core.Store;
 using LongoMatch.Video;
+using LongoMatch.Core.Common;
 
 namespace LongoMatch.Multimedia.Utils
 {
diff --git a/LongoMatch.Multimedia/Utils/GstDiscoverer.cs b/LongoMatch.Multimedia/Utils/GstDiscoverer.cs
index eb7a1d0..c03797f 100644
--- a/LongoMatch.Multimedia/Utils/GstDiscoverer.cs
+++ b/LongoMatch.Multimedia/Utils/GstDiscoverer.cs
@@ -17,8 +17,8 @@
 //
 using System;
 using System.Runtime.InteropServices;
-using LongoMatch.Interfaces.Multimedia;
-using LongoMatch.Store;
+using LongoMatch.Core.Interfaces.Multimedia;
+using LongoMatch.Core.Store;
 using Mono.Unix;
 using LongoMatch.Video;
 
@@ -48,7 +48,7 @@ namespace LongoMatch.Video.Utils
                        float par = 0;
                        IntPtr container_ptr, audio_codec_ptr, video_codec_ptr;
                        IntPtr error = IntPtr.Zero;
-                       LongoMatch.Common.Image preview = null;
+                       LongoMatch.Core.Common.Image preview = null;
                        MultimediaFactory factory;
                        IFramesCapturer thumbnailer;
 
@@ -82,7 +82,7 @@ namespace LongoMatch.Video.Utils
                                }
                        }
                        
-                       return new LongoMatch.Store.MediaFile (filePath, duration, (ushort)fps, has_audio, 
has_video,
+                       return new LongoMatch.Core.Store.MediaFile (filePath, duration, (ushort)fps, 
has_audio, has_video,
                                                               container, video_codec, audio_codec, width, 
height,
                                                               par, preview);
                }
diff --git a/LongoMatch.Multimedia/Utils/MultimediaFactory.cs 
b/LongoMatch.Multimedia/Utils/MultimediaFactory.cs
index cdc2a91..ef6d8a2 100644
--- a/LongoMatch.Multimedia/Utils/MultimediaFactory.cs
+++ b/LongoMatch.Multimedia/Utils/MultimediaFactory.cs
@@ -21,9 +21,9 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.InteropServices;
-using LongoMatch.Common;
-using LongoMatch.Interfaces.Multimedia;
-using LongoMatch.Store;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Interfaces.Multimedia;
+using LongoMatch.Core.Store;
 using LongoMatch.Multimedia.Utils;
 using LongoMatch.Video.Capturer;
 using LongoMatch.Video.Converter;
diff --git a/LongoMatch.Multimedia/Utils/Seeker.cs b/LongoMatch.Multimedia/Utils/Seeker.cs
index ff29edf..90529a3 100644
--- a/LongoMatch.Multimedia/Utils/Seeker.cs
+++ b/LongoMatch.Multimedia/Utils/Seeker.cs
@@ -15,7 +15,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
-using LongoMatch.Store;
+using LongoMatch.Core.Store;
 using LongoMatch.Video.Common;
 
 namespace LongoMatch.Video.Utils
diff --git a/LongoMatch.Multimedia/Utils/VideoDevice.cs b/LongoMatch.Multimedia/Utils/VideoDevice.cs
index fdb6af1..6f9b332 100644
--- a/LongoMatch.Multimedia/Utils/VideoDevice.cs
+++ b/LongoMatch.Multimedia/Utils/VideoDevice.cs
@@ -16,7 +16,7 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 // 
 using System.Collections.Generic;
-using LongoMatch.Common;
+using LongoMatch.Core.Common;
 using LongoMatch.Video.Capturer;
 
 namespace LongoMatch.Multimedia.Utils
diff --git a/LongoMatch.Plugins/CSVExporter.cs b/LongoMatch.Plugins/CSVExporter.cs
index a212697..1b94acc 100644
--- a/LongoMatch.Plugins/CSVExporter.cs
+++ b/LongoMatch.Plugins/CSVExporter.cs
@@ -21,10 +21,10 @@ using System.Linq;
 using Mono.Addins;
 using Mono.Unix;
 using LongoMatch.Addins.ExtensionPoints;
-using LongoMatch.Interfaces.GUI;
-using LongoMatch.Store;
+using LongoMatch.Core.Interfaces.GUI;
+using LongoMatch.Core.Store;
 using System.IO;
-using LongoMatch.Interfaces;
+using LongoMatch.Core.Interfaces;
 
 namespace LongoMatch.Plugins
 {
diff --git a/LongoMatch.Services/LongoMatch.Services.mdp b/LongoMatch.Services/LongoMatch.Services.mdp
index 5b42483..82d8a97 100644
--- a/LongoMatch.Services/LongoMatch.Services.mdp
+++ b/LongoMatch.Services/LongoMatch.Services.mdp
@@ -16,7 +16,7 @@
   <Contents>
     <File subtype="Code" buildaction="Compile" name="Services/TemplatesService.cs" />
     <File subtype="Code" buildaction="Compile" name="Services/RenderingJobsManager.cs" />
-    <File subtype="Code" buildaction="Compile" name="Services/Core.cs" />
+    <File subtype="Code" buildaction="Compile" name="Services/CoreServices.cs" />
     <File subtype="Code" buildaction="Compile" name="Services/HotKeysManager.cs" />
     <File subtype="Code" buildaction="Compile" name="Services/EventsManager.cs" />
     <File subtype="Code" buildaction="Compile" name="Services/PlaylistManager.cs" />
diff --git a/LongoMatch.Services/Makefile.am b/LongoMatch.Services/Makefile.am
index baa02c4..cb1d026 100644
--- a/LongoMatch.Services/Makefile.am
+++ b/LongoMatch.Services/Makefile.am
@@ -3,7 +3,7 @@ TARGET = library
 
 LINK = $(REF_DEP_LONGOMATCH_SERVICES)
 
-SOURCES = Services/Core.cs \
+SOURCES = Services/CoreServices.cs \
        Services/DataBaseManager.cs \
        Services/EventsManager.cs \
        Services/FileDB.cs \
diff --git a/LongoMatch.Services/Services/Core.cs b/LongoMatch.Services/Services/CoreServices.cs
similarity index 97%
rename from LongoMatch.Services/Services/Core.cs
rename to LongoMatch.Services/Services/CoreServices.cs
index e083d85..7e99dcf 100644
--- a/LongoMatch.Services/Services/Core.cs
+++ b/LongoMatch.Services/Services/CoreServices.cs
@@ -19,10 +19,10 @@ using System;
 using System.IO;
 using LongoMatch;
 using LongoMatch.DB;
-using LongoMatch.Common;
-using LongoMatch.Interfaces;
-using LongoMatch.Interfaces.GUI;
-using LongoMatch.Interfaces.Multimedia;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Interfaces;
+using LongoMatch.Core.Interfaces.GUI;
+using LongoMatch.Core.Interfaces.Multimedia;
 using Mono.Unix;
 
 #if OSTYPE_WINDOWS
@@ -31,7 +31,7 @@ using System.Runtime.InteropServices;
 #endif
 namespace LongoMatch.Services
 {
-       public class Core
+       public class CoreServices
        {
                static DataBaseManager dbManager;
                static EventsManager eManager;
diff --git a/LongoMatch.Services/Services/DataBaseManager.cs b/LongoMatch.Services/Services/DataBaseManager.cs
index be895c6..c2ae3c4 100644
--- a/LongoMatch.Services/Services/DataBaseManager.cs
+++ b/LongoMatch.Services/Services/DataBaseManager.cs
@@ -20,10 +20,10 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using Mono.Unix;
-using LongoMatch.Interfaces;
-using LongoMatch.Interfaces.GUI;
-using LongoMatch.Store;
-using LongoMatch.Common;
+using LongoMatch.Core.Interfaces;
+using LongoMatch.Core.Interfaces.GUI;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Common;
 
 namespace LongoMatch.DB
 {
diff --git a/LongoMatch.Services/Services/EventsManager.cs b/LongoMatch.Services/Services/EventsManager.cs
index 47a3849..ece685a 100644
--- a/LongoMatch.Services/Services/EventsManager.cs
+++ b/LongoMatch.Services/Services/EventsManager.cs
@@ -19,14 +19,14 @@
 //
 using System;
 using System.Collections.Generic;
-using LongoMatch.Common;
-using LongoMatch.Interfaces;
-using LongoMatch.Interfaces.GUI;
-using LongoMatch.Store;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Interfaces;
+using LongoMatch.Core.Interfaces.GUI;
+using LongoMatch.Core.Store;
 using Mono.Unix;
 using System.IO;
-using LongoMatch.Interfaces.Multimedia;
-using LongoMatch.Store.Playlists;
+using LongoMatch.Core.Interfaces.Multimedia;
+using LongoMatch.Core.Store.Playlists;
 
 namespace LongoMatch.Services
 {
diff --git a/LongoMatch.Services/Services/FileDB.cs b/LongoMatch.Services/Services/FileDB.cs
index 8d46d6d..50f9033 100644
--- a/LongoMatch.Services/Services/FileDB.cs
+++ b/LongoMatch.Services/Services/FileDB.cs
@@ -19,9 +19,9 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using LongoMatch.Common;
-using LongoMatch.Interfaces;
-using LongoMatch.Store;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Interfaces;
+using LongoMatch.Core.Store;
 
 namespace LongoMatch.DB
 {
diff --git a/LongoMatch.Services/Services/HotKeysManager.cs b/LongoMatch.Services/Services/HotKeysManager.cs
index 2664e51..ed99225 100644
--- a/LongoMatch.Services/Services/HotKeysManager.cs
+++ b/LongoMatch.Services/Services/HotKeysManager.cs
@@ -19,9 +19,9 @@
 //
 //
 using System.Collections.Generic;
-using LongoMatch.Common;
-using LongoMatch.Interfaces.GUI;
-using LongoMatch.Store;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Interfaces.GUI;
+using LongoMatch.Core.Store;
 
 #if HAVE_GTK
 using Gdk;
diff --git a/LongoMatch.Services/Services/PlaylistManager.cs b/LongoMatch.Services/Services/PlaylistManager.cs
index 4ef4adf..3e1e3be 100644
--- a/LongoMatch.Services/Services/PlaylistManager.cs
+++ b/LongoMatch.Services/Services/PlaylistManager.cs
@@ -17,11 +17,11 @@
 // 
 using System.Collections.Generic;
 using System.Threading;
-using LongoMatch.Common;
-using LongoMatch.Interfaces;
-using LongoMatch.Interfaces.GUI;
-using LongoMatch.Store;
-using LongoMatch.Store.Playlists;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Interfaces;
+using LongoMatch.Core.Interfaces.GUI;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Store.Playlists;
 using Mono.Unix;
 using Timer = System.Threading.Timer;
 
diff --git a/LongoMatch.Services/Services/ProjectsManager.cs b/LongoMatch.Services/Services/ProjectsManager.cs
index 25781da..306f601 100644
--- a/LongoMatch.Services/Services/ProjectsManager.cs
+++ b/LongoMatch.Services/Services/ProjectsManager.cs
@@ -17,11 +17,11 @@
 //
 using System;
 using System.IO;
-using LongoMatch.Common;
-using LongoMatch.Interfaces;
-using LongoMatch.Interfaces.GUI;
-using LongoMatch.Interfaces.Multimedia;
-using LongoMatch.Store;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Interfaces;
+using LongoMatch.Core.Interfaces.GUI;
+using LongoMatch.Core.Interfaces.Multimedia;
+using LongoMatch.Core.Store;
 using Mono.Unix;
 
 namespace LongoMatch.Services
diff --git a/LongoMatch.Services/Services/RenderingJobsManager.cs 
b/LongoMatch.Services/Services/RenderingJobsManager.cs
index 25d8a47..187883c 100644
--- a/LongoMatch.Services/Services/RenderingJobsManager.cs
+++ b/LongoMatch.Services/Services/RenderingJobsManager.cs
@@ -17,13 +17,13 @@
 // 
 using System;
 using System.Collections.Generic;
-using LongoMatch.Common;
-using LongoMatch.Interfaces;
-using LongoMatch.Interfaces.GUI;
-using LongoMatch.Interfaces.Multimedia;
-using LongoMatch.Store;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Interfaces;
+using LongoMatch.Core.Interfaces.GUI;
+using LongoMatch.Core.Interfaces.Multimedia;
+using LongoMatch.Core.Store;
 using Mono.Unix;
-using LongoMatch.Store.Playlists;
+using LongoMatch.Core.Store.Playlists;
 
 namespace LongoMatch.Services
 {
diff --git a/LongoMatch.Services/Services/TemplatesService.cs 
b/LongoMatch.Services/Services/TemplatesService.cs
index 5ba5a3f..cc8de5e 100644
--- a/LongoMatch.Services/Services/TemplatesService.cs
+++ b/LongoMatch.Services/Services/TemplatesService.cs
@@ -19,10 +19,10 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
-using LongoMatch.Common;
-using LongoMatch.Interfaces;
-using LongoMatch.Store;
-using LongoMatch.Store.Templates;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Interfaces;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Store.Templates;
 using Mono.Unix;
 
 namespace LongoMatch.Services
diff --git a/LongoMatch.Services/Services/ToolsManager.cs b/LongoMatch.Services/Services/ToolsManager.cs
index 7dae754..85260f5 100644
--- a/LongoMatch.Services/Services/ToolsManager.cs
+++ b/LongoMatch.Services/Services/ToolsManager.cs
@@ -20,11 +20,11 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using LongoMatch.Addins;
-using LongoMatch.Common;
-using LongoMatch.Interfaces;
-using LongoMatch.Interfaces.GUI;
-using LongoMatch.Interfaces.Multimedia;
-using LongoMatch.Store;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Interfaces;
+using LongoMatch.Core.Interfaces.GUI;
+using LongoMatch.Core.Interfaces.Multimedia;
+using LongoMatch.Core.Store;
 using Mono.Unix;
 
 namespace LongoMatch.Services
diff --git a/LongoMatch/Main.cs b/LongoMatch/Main.cs
index e1e49d9..784ad38 100644
--- a/LongoMatch/Main.cs
+++ b/LongoMatch/Main.cs
@@ -21,11 +21,11 @@ using System.IO;
 using System.Reflection;
 using Gtk;
 using LongoMatch.Addins;
-using LongoMatch.Common;
+using LongoMatch.Core.Common;
 using LongoMatch.Drawing.Cairo;
 using LongoMatch.Gui;
 using LongoMatch.Gui.Helpers;
-using LongoMatch.Interfaces.Multimedia;
+using LongoMatch.Core.Interfaces.Multimedia;
 using LongoMatch.Multimedia.Utils;
 using LongoMatch.Services;
 using LongoMatch.Video;
@@ -38,7 +38,7 @@ namespace LongoMatch
                
                public static void Main (string[] args)
                {
-                       Core.Init ();
+                       CoreServices.Init ();
 
                        InitGtk ();
 
@@ -61,7 +61,7 @@ namespace LongoMatch
                                manager.LoadExportProjectAddins (guiToolkit.MainController);
                                manager.LoadMultimediaBackendsAddins (multimediaToolkit);
                                try {
-                                       Core.Start (guiToolkit, multimediaToolkit);
+                                       CoreServices.Start (guiToolkit, multimediaToolkit);
                                } catch (DBLockedException locked) {
                                        string msg = Catalog.GetString ("The database seems to be locked by 
another instance and " +
                                                "the application will closed.");
@@ -69,7 +69,7 @@ namespace LongoMatch
                                        Log.Exception (locked);
                                        return;
                                }
-                               manager.LoadImportProjectAddins (Core.ProjectsImporter);
+                               manager.LoadImportProjectAddins (CoreServices.ProjectsImporter);
                                Application.Run ();
                        } catch (Exception ex) {
                                ProcessExecutionError (ex);
diff --git a/Tests/Core/Drawables/TestAngle.cs b/Tests/Core/Drawables/TestAngle.cs
index e75321b..f140b91 100644
--- a/Tests/Core/Drawables/TestAngle.cs
+++ b/Tests/Core/Drawables/TestAngle.cs
@@ -17,8 +17,8 @@
 //
 using System;
 using NUnit.Framework;
-using LongoMatch.Common;
-using LongoMatch.Store.Drawables;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Store.Drawables;
 
 namespace Tests.Core.Drawables
 {
diff --git a/Tests/Core/Drawables/TestCross.cs b/Tests/Core/Drawables/TestCross.cs
index 2ac042b..d47e1d6 100644
--- a/Tests/Core/Drawables/TestCross.cs
+++ b/Tests/Core/Drawables/TestCross.cs
@@ -17,8 +17,8 @@
 //
 using System;
 using NUnit.Framework;
-using LongoMatch.Common;
-using LongoMatch.Store.Drawables;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Store.Drawables;
 
 namespace Tests.Core.Drawables
 {
diff --git a/Tests/Core/Drawables/TestDrawable.cs b/Tests/Core/Drawables/TestDrawable.cs
index e825540..a7d8a56 100644
--- a/Tests/Core/Drawables/TestDrawable.cs
+++ b/Tests/Core/Drawables/TestDrawable.cs
@@ -17,8 +17,8 @@
 //
 using System;
 using NUnit.Framework;
-using LongoMatch.Store.Drawables;
-using LongoMatch.Common;
+using LongoMatch.Core.Store.Drawables;
+using LongoMatch.Core.Common;
 
 namespace Tests.Core.Drawables
 {
diff --git a/Tests/Core/Drawables/TestEllipse.cs b/Tests/Core/Drawables/TestEllipse.cs
index 5404a12..1a1dc1b 100644
--- a/Tests/Core/Drawables/TestEllipse.cs
+++ b/Tests/Core/Drawables/TestEllipse.cs
@@ -17,8 +17,8 @@
 //
 using System;
 using NUnit.Framework;
-using LongoMatch.Common;
-using LongoMatch.Store.Drawables;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Store.Drawables;
 
 namespace Tests.Core.Drawables
 {
diff --git a/Tests/Core/Drawables/TestLine.cs b/Tests/Core/Drawables/TestLine.cs
index 783bfd5..77627f6 100644
--- a/Tests/Core/Drawables/TestLine.cs
+++ b/Tests/Core/Drawables/TestLine.cs
@@ -17,8 +17,8 @@
 //
 using System;
 using NUnit.Framework;
-using LongoMatch.Common;
-using LongoMatch.Store.Drawables;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Store.Drawables;
 
 namespace Tests.Core.Drawables
 {
diff --git a/Tests/Core/Drawables/TestMultipoints.cs b/Tests/Core/Drawables/TestMultipoints.cs
index 042ec59..c3b43e6 100644
--- a/Tests/Core/Drawables/TestMultipoints.cs
+++ b/Tests/Core/Drawables/TestMultipoints.cs
@@ -18,8 +18,8 @@
 using System;
 using System.Collections.Generic;
 using NUnit.Framework;
-using LongoMatch.Common;
-using LongoMatch.Store.Drawables;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Store.Drawables;
 
 namespace Tests.Core.Drawables
 {
diff --git a/Tests/Core/Drawables/TestQuadrilateral.cs b/Tests/Core/Drawables/TestQuadrilateral.cs
index ee48ef5..9e75de9 100644
--- a/Tests/Core/Drawables/TestQuadrilateral.cs
+++ b/Tests/Core/Drawables/TestQuadrilateral.cs
@@ -17,8 +17,8 @@
 //
 using System;
 using NUnit.Framework;
-using LongoMatch.Store.Drawables;
-using LongoMatch.Common;
+using LongoMatch.Core.Store.Drawables;
+using LongoMatch.Core.Common;
 
 namespace Tests.Core.Drawables
 {
diff --git a/Tests/Core/Drawables/TestRectangle.cs b/Tests/Core/Drawables/TestRectangle.cs
index 39b5b11..697a24f 100644
--- a/Tests/Core/Drawables/TestRectangle.cs
+++ b/Tests/Core/Drawables/TestRectangle.cs
@@ -17,8 +17,8 @@
 //
 using System;
 using NUnit.Framework;
-using LongoMatch.Store.Drawables;
-using LongoMatch.Common;
+using LongoMatch.Core.Store.Drawables;
+using LongoMatch.Core.Common;
 
 namespace Tests.Core.Drawables
 {
diff --git a/Tests/Core/Drawables/TestText.cs b/Tests/Core/Drawables/TestText.cs
index c6cc172..399274f 100644
--- a/Tests/Core/Drawables/TestText.cs
+++ b/Tests/Core/Drawables/TestText.cs
@@ -17,9 +17,9 @@
 //
 using System;
 using NUnit.Framework;
-using LongoMatch.Store.Drawables;
-using LongoMatch.Common;
-using Text = LongoMatch.Store.Drawables.Text;
+using LongoMatch.Core.Store.Drawables;
+using LongoMatch.Core.Common;
+using Text = LongoMatch.Core.Store.Drawables.Text;
 
 
 namespace Tests.Core.Drawables
diff --git a/Tests/Core/TestCategoriesTemplate.cs b/Tests/Core/TestCategoriesTemplate.cs
index 8861986..68f357e 100644
--- a/Tests/Core/TestCategoriesTemplate.cs
+++ b/Tests/Core/TestCategoriesTemplate.cs
@@ -18,9 +18,9 @@
 using System;
 using System.Collections.Generic;
 using NUnit.Framework;
-using LongoMatch.Common;
-using LongoMatch.Store;
-using LongoMatch.Store.Templates;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Store.Templates;
 
 namespace Tests.Core
 {
diff --git a/Tests/Core/TestCategory.cs b/Tests/Core/TestCategory.cs
index 82ef6f9..c0ab162 100644
--- a/Tests/Core/TestCategory.cs
+++ b/Tests/Core/TestCategory.cs
@@ -19,8 +19,8 @@ using System;
 using NUnit.Framework;
 using Newtonsoft.Json;
 
-using LongoMatch.Common;
-using LongoMatch.Store;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Store;
 using System.IO;
 using System.Collections.Generic;
 
diff --git a/Tests/Core/TestColor.cs b/Tests/Core/TestColor.cs
index 7ea83ca..5ab2c04 100644
--- a/Tests/Core/TestColor.cs
+++ b/Tests/Core/TestColor.cs
@@ -17,7 +17,7 @@
 //
 using System;
 using NUnit.Framework;
-using LongoMatch.Common;
+using LongoMatch.Core.Common;
 
 namespace Tests.Core
 {
diff --git a/Tests/Core/TestCoordinates.cs b/Tests/Core/TestCoordinates.cs
index d0e9ed0..464c640 100644
--- a/Tests/Core/TestCoordinates.cs
+++ b/Tests/Core/TestCoordinates.cs
@@ -17,8 +17,8 @@
 //
 using System;
 using NUnit.Framework;
-using LongoMatch.Common;
-using LongoMatch.Store;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Store;
 
 namespace Tests.Core
 {
diff --git a/Tests/Core/TestMediaFile.cs b/Tests/Core/TestMediaFile.cs
index 3329217..45af205 100644
--- a/Tests/Core/TestMediaFile.cs
+++ b/Tests/Core/TestMediaFile.cs
@@ -17,8 +17,8 @@
 //
 using System;
 using NUnit.Framework;
-using LongoMatch.Common;
-using LongoMatch.Store;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Store;
 
 namespace Tests.Core
 {
diff --git a/Tests/Core/TestPlay.cs b/Tests/Core/TestPlay.cs
index dc89637..f4d6acb 100644
--- a/Tests/Core/TestPlay.cs
+++ b/Tests/Core/TestPlay.cs
@@ -17,8 +17,8 @@
 //
 using System;
 using NUnit.Framework;
-using LongoMatch.Common;
-using LongoMatch.Store;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Store;
 
 namespace Tests.Core
 {
@@ -34,7 +34,7 @@ namespace Tests.Core
                        play.EventType = cat1;
                        play.Notes = "notes";
                        play.Selected = true;
-                       play.Team = LongoMatch.Common.Team.LOCAL;
+                       play.Team = LongoMatch.LongoMatch.Core.Common.Team.LOCAL;
                        play.FieldPosition = new Coordinates();
                        play.FieldPosition.Points.Add (new Point (1, 2));
                        play.HalfFieldPosition = new Coordinates ();
diff --git a/Tests/Core/TestPlayer.cs b/Tests/Core/TestPlayer.cs
index 22fed9f..55f07db 100644
--- a/Tests/Core/TestPlayer.cs
+++ b/Tests/Core/TestPlayer.cs
@@ -17,8 +17,8 @@
 //
 using System;
 using NUnit.Framework;
-using LongoMatch.Common;
-using LongoMatch.Store;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Store;
 
 
 namespace Tests.Core
diff --git a/Tests/Core/TestPlaysFilter.cs b/Tests/Core/TestPlaysFilter.cs
index 79461cc..297e73e 100644
--- a/Tests/Core/TestPlaysFilter.cs
+++ b/Tests/Core/TestPlaysFilter.cs
@@ -17,9 +17,9 @@
 //
 using NUnit.Framework;
 using System;
-using LongoMatch.Store;
-using LongoMatch.Store.Templates;
-using LongoMatch.Common;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Store.Templates;
+using LongoMatch.Core.Common;
 
 namespace Tests.Core
 {
diff --git a/Tests/Core/TestPoint.cs b/Tests/Core/TestPoint.cs
index 37f44ee..4f050de 100644
--- a/Tests/Core/TestPoint.cs
+++ b/Tests/Core/TestPoint.cs
@@ -17,8 +17,8 @@
 //
 using System;
 using NUnit.Framework;
-using LongoMatch.Store;
-using LongoMatch.Common;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Common;
 
 namespace Tests.Core
 {
diff --git a/Tests/Core/TestProject.cs b/Tests/Core/TestProject.cs
index 6ffa421..7754eef 100644
--- a/Tests/Core/TestProject.cs
+++ b/Tests/Core/TestProject.cs
@@ -18,9 +18,9 @@
 using System;
 using NUnit.Framework;
 
-using LongoMatch.Common;
-using LongoMatch.Store;
-using LongoMatch.Store.Templates;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Store.Templates;
 using System.Collections.Generic;
 using System.Linq;
 
diff --git a/Tests/Core/TestProjectDescription.cs b/Tests/Core/TestProjectDescription.cs
index c69cacb..219a78a 100644
--- a/Tests/Core/TestProjectDescription.cs
+++ b/Tests/Core/TestProjectDescription.cs
@@ -17,8 +17,8 @@
 //
 using System;
 using NUnit.Framework;
-using LongoMatch.Common;
-using LongoMatch.Store;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Store;
 
 namespace Tests.Core
 {
diff --git a/Tests/Core/TestTeamTemplate.cs b/Tests/Core/TestTeamTemplate.cs
index 6f189ab..19172d0 100644
--- a/Tests/Core/TestTeamTemplate.cs
+++ b/Tests/Core/TestTeamTemplate.cs
@@ -17,9 +17,9 @@
 //
 using System;
 using NUnit.Framework;
-using LongoMatch.Common;
-using LongoMatch.Store;
-using LongoMatch.Store.Templates;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Store;
+using LongoMatch.Core.Store.Templates;
 
 namespace Tests.Core
 {
diff --git a/Tests/Core/TestTime.cs b/Tests/Core/TestTime.cs
index 3e40ebb..74b48e5 100644
--- a/Tests/Core/TestTime.cs
+++ b/Tests/Core/TestTime.cs
@@ -17,7 +17,7 @@
 //
 using NUnit.Framework;
 using System;
-using LongoMatch.Store;
+using LongoMatch.Core.Store;
 
 namespace Tests.Core
 {
diff --git a/Tests/Core/TestTimeNode.cs b/Tests/Core/TestTimeNode.cs
index 6c3b42e..b644c27 100644
--- a/Tests/Core/TestTimeNode.cs
+++ b/Tests/Core/TestTimeNode.cs
@@ -17,8 +17,8 @@
 //
 using System;
 using NUnit.Framework;
-using LongoMatch.Common;
-using LongoMatch.Store;
+using LongoMatch.Core.Common;
+using LongoMatch.Core.Store;
 
 namespace Tests.Core
 {
diff --git a/Tests/Services/TestDatabase.cs b/Tests/Services/TestDatabase.cs
index cfbbb54..f1e8515 100644
--- a/Tests/Services/TestDatabase.cs
+++ b/Tests/Services/TestDatabase.cs
@@ -21,7 +21,7 @@ using System.IO;
 using NUnit.Framework;
 
 using LongoMatch.DB;
-using LongoMatch.Store;
+using LongoMatch.Core.Store;
 
 namespace Tests.Services
 {
diff --git a/Tests/Utils.cs b/Tests/Utils.cs
index 7423454..3737af8 100644
--- a/Tests/Utils.cs
+++ b/Tests/Utils.cs
@@ -17,7 +17,7 @@
 //
 using System;
 using System.IO;
-using LongoMatch.Common;
+using LongoMatch.Core.Common;
 using NUnit.Framework;
 
 namespace Tests
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]