diff --git a/org.example.democatalog.application/.classpath b/org.example.democatalog.application/.classpath
deleted file mode 100644
index 1fa3e6803d3b22e055b735220510616c4e35f2fc..0000000000000000000000000000000000000000
--- a/org.example.democatalog.application/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.example.democatalog.application/.project b/org.example.democatalog.application/.project
deleted file mode 100644
index 24de4198f49bad737c1109c4e6e50799ed2b670d..0000000000000000000000000000000000000000
--- a/org.example.democatalog.application/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.example.democatalog.application</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.example.democatalog.application/Application.e4xmi b/org.example.democatalog.application/Application.e4xmi
deleted file mode 100644
index 3052a285b28b28b49356fc747e5c26844c8279d5..0000000000000000000000000000000000000000
--- a/org.example.democatalog.application/Application.e4xmi
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application:Application xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:application="http://www.eclipse.org/ui/2010/UIModel/application" xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic" xmlns:menu="http://www.eclipse.org/ui/2010/UIModel/application/ui/menu" xmi:id="_6wlLcMgZEeSyMNYR5xypkQ" elementId="org.example.democatalog.application.application" bindingContexts="_6wlLecgZEeSyMNYR5xypkQ">
-  <children xsi:type="basic:TrimmedWindow" xmi:id="_6wlLccgZEeSyMNYR5xypkQ" elementId="org.example.democatalog.application.window.main" label="Demo Catalog" width="500" height="400">
-    <mainMenu xmi:id="_6wlLicgZEeSyMNYR5xypkQ" elementId="org.eclipse.ui.main.menu">
-      <children xsi:type="menu:Menu" xmi:id="_6wlLisgZEeSyMNYR5xypkQ" elementId="file" label="File">
-        <children xsi:type="menu:HandledMenuItem" xmi:id="_1aSskCQeEeuaK-RhvCx2-Q" elementId="org.example.democatalog.application.handleditem.file.new" label="New" command="_a7OMwCQeEeuaK-RhvCx2-Q"/>
-        <children xsi:type="menu:HandledMenuItem" xmi:id="_6wlLi8gZEeSyMNYR5xypkQ" elementId="org.example.democatalog.application.handleditem.file.open" label="Open" iconURI="platform:/plugin/org.example.democatalog.application/icons/open_in_app.png" command="_6wlLgMgZEeSyMNYR5xypkQ"/>
-        <children xsi:type="menu:HandledMenuItem" xmi:id="_6wlLjMgZEeSyMNYR5xypkQ" elementId="org.example.democatalog.application.handleditem.save" label="Save" iconURI="platform:/plugin/org.example.democatalog.application/icons/save_edit.png" command="_6wlLg8gZEeSyMNYR5xypkQ"/>
-        <children xsi:type="menu:HandledMenuItem" xmi:id="_6wlLjcgZEeSyMNYR5xypkQ" elementId="org.example.democatalog.application.handleditem.quit" label="Quit" command="_6wlLfMgZEeSyMNYR5xypkQ"/>
-      </children>
-      <children xsi:type="menu:Menu" xmi:id="_6wlLjsgZEeSyMNYR5xypkQ" elementId="help" label="Help">
-        <children xsi:type="menu:HandledMenuItem" xmi:id="_6wlLj8gZEeSyMNYR5xypkQ" elementId="org.example.democatalog.application.handleditem.about" label="About" command="_6wlLhsgZEeSyMNYR5xypkQ"/>
-      </children>
-    </mainMenu>
-    <trimBars xmi:id="_6wlLlcgZEeSyMNYR5xypkQ" elementId="org.example.democatalog.application.trimbar.top">
-      <children xsi:type="menu:ToolBar" xmi:id="_6wlLlsgZEeSyMNYR5xypkQ" elementId="org.eclipse.ui.main.toolbar">
-        <children xsi:type="menu:HandledToolItem" xmi:id="_-6l-ICQeEeuaK-RhvCx2-Q" elementId="org.example.democatalog.application.handleditem.trimbar.top.new" label="New" command="_a7OMwCQeEeuaK-RhvCx2-Q"/>
-        <children xsi:type="menu:HandledToolItem" xmi:id="_6wlLl8gZEeSyMNYR5xypkQ" elementId="org.example.democatalog.application.handleditem.trimbar.top.open" iconURI="platform:/plugin/org.example.democatalog.application/icons/open_in_app.png" command="_6wlLgMgZEeSyMNYR5xypkQ"/>
-        <children xsi:type="menu:HandledToolItem" xmi:id="_6wlLmMgZEeSyMNYR5xypkQ" elementId="org.example.democatalog.application.handleditem.trimbar.top.save" iconURI="platform:/plugin/org.example.democatalog.application/icons/save_edit.png" command="_6wlLg8gZEeSyMNYR5xypkQ"/>
-      </children>
-    </trimBars>
-  </children>
-  <handlers xmi:id="_Yu9JgCQeEeuaK-RhvCx2-Q" elementId="org.example.democatalog.application.handler.0" contributionURI="bundleclass://org.example.democatalog.application/org.example.democatalog.application.handlers.NewHandler" command="_a7OMwCQeEeuaK-RhvCx2-Q"/>
-  <handlers xmi:id="_6wlLgcgZEeSyMNYR5xypkQ" elementId="org.example.democatalog.application.handler.openCommand" contributionURI="bundleclass://org.example.democatalog.application/org.example.democatalog.application.handlers.OpenHandler" command="_6wlLgMgZEeSyMNYR5xypkQ"/>
-  <handlers xmi:id="_6wlLhMgZEeSyMNYR5xypkQ" elementId="org.example.democatalog.application.handler.saveCommand" contributionURI="bundleclass://org.example.democatalog.application/org.example.democatalog.application.handlers.SaveHandler" command="_6wlLg8gZEeSyMNYR5xypkQ"/>
-  <handlers xmi:id="_6wlLh8gZEeSyMNYR5xypkQ" elementId="org.example.democatalog.application.handler.aboutCommand" contributionURI="bundleclass://org.example.democatalog.application/org.example.democatalog.application.handlers.AboutHandler" command="_6wlLhsgZEeSyMNYR5xypkQ"/>
-  <handlers xmi:id="_6wlLfcgZEeSyMNYR5xypkQ" elementId="org.example.democatalog.application.handler.quitCommand" contributionURI="bundleclass://org.example.democatalog.application/org.example.democatalog.application.handlers.QuitHandler" command="_6wlLfMgZEeSyMNYR5xypkQ"/>
-  <bindingTables xmi:id="_6wlLfsgZEeSyMNYR5xypkQ" elementId="org.example.democatalog.application.bindingtable" bindingContext="_6wlLecgZEeSyMNYR5xypkQ">
-    <bindings xmi:id="_6wlLf8gZEeSyMNYR5xypkQ" elementId="org.example.democatalog.application.keybinding.m1q" keySequence="M1+Q" command="_6wlLfMgZEeSyMNYR5xypkQ"/>
-    <bindings xmi:id="_6wlLgsgZEeSyMNYR5xypkQ" elementId="org.example.democatalog.application.keybinding.m1o" keySequence="M1+O" command="_6wlLgMgZEeSyMNYR5xypkQ"/>
-    <bindings xmi:id="_6wlLhcgZEeSyMNYR5xypkQ" elementId="org.example.democatalog.application.keybinding.m1s" keySequence="M1+S" command="_6wlLg8gZEeSyMNYR5xypkQ"/>
-    <bindings xmi:id="_6wlLiMgZEeSyMNYR5xypkQ" elementId="org.example.democatalog.application.keybinding.m1a" keySequence="M1+A" command="_6wlLhsgZEeSyMNYR5xypkQ"/>
-  </bindingTables>
-  <rootContext xmi:id="_6wlLecgZEeSyMNYR5xypkQ" elementId="org.eclipse.ui.contexts.dialogAndWindow" name="In Dialog and Windows">
-    <children xmi:id="_6wlLesgZEeSyMNYR5xypkQ" elementId="org.eclipse.ui.contexts.window" name="In Windows"/>
-    <children xmi:id="_6wlLe8gZEeSyMNYR5xypkQ" elementId="org.eclipse.ui.contexts.dialog" name="In Dialogs"/>
-  </rootContext>
-  <descriptors xmi:id="_R3oEICQEEeuaK-RhvCx2-Q" elementId="org.example.democatalog.application.partdescriptor.catalog" contributionURI="bundleclass://org.example.democatalog.application/org.example.democatalog.application.parts.CatalogPart"/>
-  <commands xmi:id="_a7OMwCQeEeuaK-RhvCx2-Q" elementId="org.eclipse.ui.file.new" commandName="newCommand"/>
-  <commands xmi:id="_6wlLgMgZEeSyMNYR5xypkQ" elementId="org.eclipse.ui.file.open" commandName="openCommand"/>
-  <commands xmi:id="_6wlLg8gZEeSyMNYR5xypkQ" elementId="org.eclipse.ui.file.save" commandName="saveCommand"/>
-  <commands xmi:id="_6wlLhsgZEeSyMNYR5xypkQ" elementId="org.eclipse.ui.help.aboutAction" commandName="aboutCommand"/>
-  <commands xmi:id="_6wlLfMgZEeSyMNYR5xypkQ" elementId="org.eclipse.ui.file.exit" commandName="quitCommand"/>
-  <addons xmi:id="_6wlLcsgZEeSyMNYR5xypkQ" elementId="org.eclipse.e4.core.commands.service" contributionURI="bundleclass://org.eclipse.e4.core.commands/org.eclipse.e4.core.commands.CommandServiceAddon"/>
-  <addons xmi:id="_6wlLc8gZEeSyMNYR5xypkQ" elementId="org.eclipse.e4.ui.contexts.service" contributionURI="bundleclass://org.eclipse.e4.ui.services/org.eclipse.e4.ui.services.ContextServiceAddon"/>
-  <addons xmi:id="_6wlLdMgZEeSyMNYR5xypkQ" elementId="org.eclipse.e4.ui.bindings.service" contributionURI="bundleclass://org.eclipse.e4.ui.bindings/org.eclipse.e4.ui.bindings.BindingServiceAddon"/>
-  <addons xmi:id="_6wlLdcgZEeSyMNYR5xypkQ" elementId="org.eclipse.e4.ui.workbench.commands.model" contributionURI="bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.CommandProcessingAddon"/>
-  <addons xmi:id="_6wlLdsgZEeSyMNYR5xypkQ" elementId="org.eclipse.e4.ui.workbench.handler.model" contributionURI="bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.HandlerProcessingAddon"/>
-  <addons xmi:id="_6wlLd8gZEeSyMNYR5xypkQ" elementId="org.eclipse.e4.ui.workbench.contexts.model" contributionURI="bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.ContextProcessingAddon"/>
-  <addons xmi:id="_6wlLeMgZEeSyMNYR5xypkQ" elementId="org.eclipse.e4.ui.workbench.bindings.model" contributionURI="bundleclass://org.eclipse.e4.ui.workbench.swt/org.eclipse.e4.ui.workbench.swt.util.BindingProcessingAddon"/>
-</application:Application>
diff --git a/org.example.democatalog.application/META-INF/MANIFEST.MF b/org.example.democatalog.application/META-INF/MANIFEST.MF
deleted file mode 100644
index 458eb24478d8294a47058e7148f19bfdeef3db2e..0000000000000000000000000000000000000000
--- a/org.example.democatalog.application/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,25 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Demo Catalog
-Bundle-SymbolicName: org.example.democatalog.application;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Require-Bundle: javax.inject;bundle-version="0.0.0",
- org.eclipse.core.runtime;bundle-version="0.0.0",
- org.eclipse.swt;bundle-version="0.0.0",
- org.eclipse.e4.ui.model.workbench;bundle-version="0.0.0",
- org.eclipse.jface;bundle-version="0.0.0",
- org.eclipse.e4.ui.services;bundle-version="0.0.0",
- org.eclipse.e4.ui.workbench;bundle-version="0.0.0",
- org.eclipse.e4.core.di;bundle-version="0.0.0",
- org.eclipse.e4.ui.di;bundle-version="0.0.0",
- org.eclipse.e4.core.contexts;bundle-version="0.0.0",
- org.eclipse.emf.ecore,
- org.eclipse.emf.ecp.ui.view,
- org.eclipse.emf.ecp.ui.view.swt,
- org.eclipse.emf.edit,
- org.example.democatalog;bundle-version="1.0.0",
- org.example.democatalog.edit;bundle-version="1.0.0",
- org.example.democatalog.viewmodel;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-15
-Import-Package: javax.annotation;version="0.0.0"
-Automatic-Module-Name: org.example.democatalog.application
diff --git a/org.example.democatalog.application/build.properties b/org.example.democatalog.application/build.properties
deleted file mode 100644
index 04ab1e9b8f3cd4339dc61f93907610aecbd48895..0000000000000000000000000000000000000000
--- a/org.example.democatalog.application/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = plugin.xml,\
-               META-INF/,\
-               .,\
-               icons/,\
-               css/default.css,\
-               Application.e4xmi
diff --git a/org.example.democatalog.application/css/default.css b/org.example.democatalog.application/css/default.css
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/org.example.democatalog.application/icons/home.png b/org.example.democatalog.application/icons/home.png
deleted file mode 100644
index e9ace41c655fcbe6450482aa21e4de88f6905b04..0000000000000000000000000000000000000000
Binary files a/org.example.democatalog.application/icons/home.png and /dev/null differ
diff --git a/org.example.democatalog.application/icons/open_in_app.png b/org.example.democatalog.application/icons/open_in_app.png
deleted file mode 100644
index 9df4eeb7c3b8e6d1ff41f77b6032062a0edb4695..0000000000000000000000000000000000000000
Binary files a/org.example.democatalog.application/icons/open_in_app.png and /dev/null differ
diff --git a/org.example.democatalog.application/icons/save_edit.png b/org.example.democatalog.application/icons/save_edit.png
deleted file mode 100644
index b17caf5a984540e8b1448057feeecc5183c58eaa..0000000000000000000000000000000000000000
Binary files a/org.example.democatalog.application/icons/save_edit.png and /dev/null differ
diff --git a/org.example.democatalog.application/org.example.democatalog.application.product b/org.example.democatalog.application/org.example.democatalog.application.product
deleted file mode 100644
index e91db3723ba13786e5437884789aeeb67d8f5695..0000000000000000000000000000000000000000
--- a/org.example.democatalog.application/org.example.democatalog.application.product
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?>
-
-<product name="Demo Catalog" uid="org.example.democatalog.application.product" id="org.example.democatalog.application.product" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="1.0.0.qualifier" useFeatures="true" includeLaunchers="false">
-
-   <configIni use="default">
-   </configIni>
-
-   <launcherArgs>
-      <programArgs>-clearPersistedState
-      </programArgs>
-      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
-      </vmArgsMac>
-   </launcherArgs>
-
-   <windowImages/>
-
-   <launcher>
-      <win useIco="false">
-         <bmp/>
-      </win>
-   </launcher>
-
-   <vm>
-   </vm>
-
-   <plugins>
-   </plugins>
-
-   <features>
-      <feature id="org.example.democatalog.feature"/>
-      <feature id="org.eclipse.e4.rcp"/>
-      <feature id="org.eclipse.emf.ecp.emfforms.runtime.feature"/>
-      <feature id="org.eclipse.emf.common"/>
-      <feature id="org.eclipse.emf.common.ui"/>
-      <feature id="org.eclipse.emf.databinding"/>
-      <feature id="org.eclipse.emf.databinding.edit"/>
-      <feature id="org.eclipse.emf.ecore"/>
-      <feature id="org.eclipse.emf.ecore.edit"/>
-      <feature id="org.eclipse.emf.edit"/>
-      <feature id="org.eclipse.emf.edit.ui"/>
-      <feature id="org.eclipse.rcp" installMode="root"/>
-   </features>
-
-   <configurations>
-      <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
-   </configurations>
-
-   <preferencesInfo>
-      <targetfile overwrite="false"/>
-   </preferencesInfo>
-
-   <cssInfo>
-   </cssInfo>
-
-</product>
diff --git a/org.example.democatalog.application/plugin.xml b/org.example.democatalog.application/plugin.xml
deleted file mode 100644
index 05c79e5fa3cf26417bb35405bc10e9ce6c8168c5..0000000000000000000000000000000000000000
--- a/org.example.democatalog.application/plugin.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-
-   <extension
-         id="product"
-         point="org.eclipse.core.runtime.products">
-      <product
-            application="org.eclipse.e4.ui.workbench.swt.E4Application"
-            name="Demo Catalog">
-         <property
-               name="appName"
-               value="Demo Catalog">
-         </property>
-      </product>
-   </extension>
-
-</plugin>
diff --git a/org.example.democatalog.application/src/org/example/democatalog/application/handlers/AboutHandler.java b/org.example.democatalog.application/src/org/example/democatalog/application/handlers/AboutHandler.java
deleted file mode 100644
index 2a64919116bcc81552f8b575e8cf52477b04dd26..0000000000000000000000000000000000000000
--- a/org.example.democatalog.application/src/org/example/democatalog/application/handlers/AboutHandler.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.example.democatalog.application.handlers;
-
-import org.eclipse.e4.core.di.annotations.Execute;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.widgets.Shell;
-
-public class AboutHandler {
-	@Execute
-	public void execute(Shell shell) {
-		MessageDialog.openInformation(shell, "About", "Demo Catalog");
-	}
-}
diff --git a/org.example.democatalog.application/src/org/example/democatalog/application/handlers/HandlerUtils.java b/org.example.democatalog.application/src/org/example/democatalog/application/handlers/HandlerUtils.java
deleted file mode 100644
index 83764e34a19378994268dc6c077619a0d816702f..0000000000000000000000000000000000000000
--- a/org.example.democatalog.application/src/org/example/democatalog/application/handlers/HandlerUtils.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.example.democatalog.application.handlers;
-
-import org.eclipse.e4.core.contexts.IEclipseContext;
-import org.eclipse.e4.ui.model.application.ui.basic.MPart;
-import org.eclipse.e4.ui.workbench.modeling.EPartService;
-import org.eclipse.e4.ui.workbench.modeling.EPartService.PartState;
-import org.eclipse.emf.common.command.BasicCommandStack;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Shell;
-
-class HandlerUtils {
-	static final String CATALOG_PARTDESCRIPTOR_ID = "org.example.democatalog.application.partdescriptor.catalog";
-	
-	public static String openFileDialog(Shell shell) {
-		return invokeFileDialog(new FileDialog(shell, SWT.OPEN));
-	}
-
-	public static String newFileDialog(Shell shell) {
-		return invokeFileDialog(new FileDialog(shell, SWT.SAVE));
-	}
-
-	private static String invokeFileDialog(FileDialog dialog) {
-		dialog.setFilterPath(System.getProperty("user.home"));
-		dialog.setFilterNames(new String [] {"Demo Catalog", "All Files (*)"});
-		dialog.setFilterExtensions(new String [] {"*.democat", "*"});
-		return dialog.open();
-	}
-	
-	static void createNewPartWithCatalog(IEclipseContext context, EPartService partService, Resource resource) {		
-		context.set(Resource.class, resource);
-		MPart catalogPart = partService.createPart(CATALOG_PARTDESCRIPTOR_ID);
-		catalogPart.setDirty(true); // must listen to adapter!
-		catalogPart.setLabel(resource.getURI().lastSegment());
-		partService.showPart(catalogPart, PartState.ACTIVATE);
-	}
-	
-	static AdapterFactoryEditingDomain createEditingDomain() {
-		final AdapterFactory composedAdapterFactory = new ComposedAdapterFactory(
-				ComposedAdapterFactory.Descriptor.Registry.INSTANCE); // no dispose required?
-		final AdapterFactoryEditingDomain domain = new AdapterFactoryEditingDomain(composedAdapterFactory,
-				new BasicCommandStack());
-		return domain;
-	}
-
-}
diff --git a/org.example.democatalog.application/src/org/example/democatalog/application/handlers/NewHandler.java b/org.example.democatalog.application/src/org/example/democatalog/application/handlers/NewHandler.java
deleted file mode 100644
index b952101dc83705635307532beef9e67887bb928b..0000000000000000000000000000000000000000
--- a/org.example.democatalog.application/src/org/example/democatalog/application/handlers/NewHandler.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.example.democatalog.application.handlers;
-
-import java.io.IOException;
-
-import javax.inject.Named;
-
-import org.eclipse.e4.core.di.annotations.Execute;
-import org.eclipse.e4.ui.model.application.MApplication;
-import org.eclipse.e4.ui.services.IServiceConstants;
-import org.eclipse.e4.ui.workbench.modeling.EPartService;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
-import org.eclipse.swt.widgets.Shell;
-
-import org.example.democatalog.DemocatalogPackage;
-
-public class NewHandler {
-	static final String CATALOG_PARTDESCRIPTOR_ID = "org.example.democatalog.application.partdescriptor.catalog";
-
-	@Execute
-	public void execute(MApplication application, @Named(IServiceConstants.ACTIVE_SHELL) Shell shell,
-			EPartService partService) {
-
-		final String pathToNewCatalog = HandlerUtils.newFileDialog(shell);
-
-		if (pathToNewCatalog != null) {
-			// create new catalog with resource at above path
-			final AdapterFactoryEditingDomain domain = HandlerUtils.createEditingDomain();
-			final Resource catalogResource = domain.createResource("file://" + pathToNewCatalog);
-
-			// assume default XMI factory was used to create an XML resource
-			if (catalogResource instanceof XMLResource) {
-				((XMLResource)catalogResource).setEncoding("UTF-8");
-			}
-
-			final EObject catalog = EcoreUtil.create(DemocatalogPackage.eINSTANCE.getEnergyComponentCatalog());
-			catalogResource.getContents().add(catalog);
-
-			// store new (empty) resource at selected path
-			try {
-				catalogResource.save(null);
-			} catch (IOException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-
-			HandlerUtils.createNewPartWithCatalog(application.getContext(), partService, catalogResource);
-		}
-	}
-}
\ No newline at end of file
diff --git a/org.example.democatalog.application/src/org/example/democatalog/application/handlers/OpenHandler.java b/org.example.democatalog.application/src/org/example/democatalog/application/handlers/OpenHandler.java
deleted file mode 100644
index 5b71c83cd147a4b3a36bf0a55d3e13c112bdbf8a..0000000000000000000000000000000000000000
--- a/org.example.democatalog.application/src/org/example/democatalog/application/handlers/OpenHandler.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.example.democatalog.application.handlers;
-
-import org.eclipse.e4.core.di.annotations.Execute;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Shell;
-public class OpenHandler {
-
-	@Execute
-	public void execute(Shell shell){
-		FileDialog dialog = new FileDialog(shell);
-		dialog.open();
-	}
-}
diff --git a/org.example.democatalog.application/src/org/example/democatalog/application/handlers/QuitHandler.java b/org.example.democatalog.application/src/org/example/democatalog/application/handlers/QuitHandler.java
deleted file mode 100644
index c7fe5871ea36815ed4096b79cf5e9928cc6c6496..0000000000000000000000000000000000000000
--- a/org.example.democatalog.application/src/org/example/democatalog/application/handlers/QuitHandler.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.example.democatalog.application.handlers;
-
-import org.eclipse.e4.core.di.annotations.Execute;
-import org.eclipse.e4.ui.workbench.IWorkbench;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.widgets.Shell;
-
-
-public class QuitHandler {
-	@Execute
-	public void execute(IWorkbench workbench, Shell shell){
-		if (MessageDialog.openConfirm(shell, "Confirmation",
-				"Do you want to exit?")) {
-			workbench.close();
-		}
-	}
-}
diff --git a/org.example.democatalog.application/src/org/example/democatalog/application/handlers/SaveHandler.java b/org.example.democatalog.application/src/org/example/democatalog/application/handlers/SaveHandler.java
deleted file mode 100644
index 8776afbe2e343a76f8dcc28fe49b9753896f3fe8..0000000000000000000000000000000000000000
--- a/org.example.democatalog.application/src/org/example/democatalog/application/handlers/SaveHandler.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.example.democatalog.application.handlers;
-
-import org.eclipse.e4.core.di.annotations.CanExecute;
-import org.eclipse.e4.core.di.annotations.Execute;
-import org.eclipse.e4.ui.workbench.modeling.EPartService;
-
-public class SaveHandler {
-
-	@CanExecute
-	public boolean canExecute(EPartService partService) {
-		if (partService != null) {
-			return !partService.getDirtyParts().isEmpty();
-		}
-		return false;
-	}
-
-	@Execute
-	public void execute(EPartService partService) {
-		partService.saveAll(false);
-	}
-}
\ No newline at end of file
diff --git a/org.example.democatalog.application/src/org/example/democatalog/application/parts/CatalogPart.java b/org.example.democatalog.application/src/org/example/democatalog/application/parts/CatalogPart.java
deleted file mode 100644
index 6dbfc361d6a4992023dcfaffca02d5cdef797e36..0000000000000000000000000000000000000000
--- a/org.example.democatalog.application/src/org/example/democatalog/application/parts/CatalogPart.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.example.democatalog.application.parts;
-
-import java.io.IOException;
-
-import javax.annotation.PostConstruct;
-
-import org.eclipse.e4.ui.di.Persist;
-import org.eclipse.e4.ui.model.application.MApplication;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecp.ui.view.ECPRendererException;
-import org.eclipse.emf.ecp.ui.view.swt.ECPSWTViewRenderer;
-import org.eclipse.jface.layout.GridLayoutFactory;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * Part for displaying a Forms Editor for a DemoCatalog.
- * See https://www.vogella.com/tutorials/Eclipse4Services/article.html#implementing-editor-like-behavior.
- */
-public class CatalogPart {
-	private Resource demoCatalogResource;
-	
-	@PostConstruct
-	public void createComposite(MApplication application, Composite parent) {
-		demoCatalogResource = application.getContext().get(Resource.class);
-		EObject energyCatalog = demoCatalogResource.getContents().get(0);
-		try {
-			final Composite content = new Composite(parent, SWT.NONE);
-			content.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_WHITE));
-			content.setLayout(GridLayoutFactory.fillDefaults().margins(10, 10).create());
-			ECPSWTViewRenderer.INSTANCE.render(content, energyCatalog);
-			content.layout();
-		} catch (final ECPRendererException e) {
-			e.printStackTrace();
-		}
-		parent.layout();
-	}
-	
-	@Persist
-	public void save() {
-		System.out.println("Saved " + demoCatalogResource);
-		try {
-			demoCatalogResource.save(null);
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/org.example.democatalog.feature/.project b/org.example.democatalog.feature/.project
deleted file mode 100644
index a5a763b8e77c953ab4def106d5efd974e9c13a81..0000000000000000000000000000000000000000
--- a/org.example.democatalog.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.example.democatalog.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.example.democatalog.feature/build.properties b/org.example.democatalog.feature/build.properties
deleted file mode 100644
index 64f93a9f0b7328eb563aa5ad6cec7f828020e124..0000000000000000000000000000000000000000
--- a/org.example.democatalog.feature/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml
diff --git a/org.example.democatalog.feature/feature.xml b/org.example.democatalog.feature/feature.xml
deleted file mode 100644
index 1b857ada63b48d6c44ffdf1fe99e37cf9c481140..0000000000000000000000000000000000000000
--- a/org.example.democatalog.feature/feature.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.example.democatalog.feature"
-      label="Demo Catalog"
-      version="1.0.0.qualifier"
-      provider-name="EXAMPLE">
-
-   <description url="http://www.example.com/description">
-      [Enter Feature Description here.]
-   </description>
-
-   <copyright url="http://www.example.com/copyright">
-      [Enter Copyright Description here.]
-   </copyright>
-
-   <license url="http://www.example.com/license">
-      [Enter License Description here.]
-   </license>
-
-   <plugin
-         id="org.example.democatalog"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.example.democatalog.application"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.example.democatalog.edit"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.example.democatalog.viewmodel"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-  <plugin
-         id="org.eclipse.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.views"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.workbench"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.help"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.resources"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.filesystem"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jface.text"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.text"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-
-
-</feature>