diff --git a/common/build.gradle b/common/build.gradle
new file mode 100644
index 0000000000000000000000000000000000000000..54c9d56f4a0e3f95e4eed46bfa9c8766579b6058
--- /dev/null
+++ b/common/build.gradle
@@ -0,0 +1,7 @@
+apply plugin: 'eclipse'
+apply plugin: 'java'
+
+dependencies {
+	compile 'net.kieker-monitoring:kieker:1.12:emf'
+	compile 'javax:javaee-api:6.0'
+}
\ No newline at end of file
diff --git a/src/main/java/kieker/webgui/common/ClassContainer.java b/common/src/main/java/kieker/webgui/common/ClassContainer.java
similarity index 100%
rename from src/main/java/kieker/webgui/common/ClassContainer.java
rename to common/src/main/java/kieker/webgui/common/ClassContainer.java
diff --git a/src/main/java/kieker/webgui/common/EnvironmentLoaderListener.java b/common/src/main/java/kieker/webgui/common/EnvironmentLoaderListener.java
similarity index 100%
rename from src/main/java/kieker/webgui/common/EnvironmentLoaderListener.java
rename to common/src/main/java/kieker/webgui/common/EnvironmentLoaderListener.java
diff --git a/src/main/java/kieker/webgui/common/LogEntry.java b/common/src/main/java/kieker/webgui/common/LogEntry.java
similarity index 100%
rename from src/main/java/kieker/webgui/common/LogEntry.java
rename to common/src/main/java/kieker/webgui/common/LogEntry.java
diff --git a/src/main/java/kieker/webgui/common/exception/AbstractKiekerWebGUIException.java b/common/src/main/java/kieker/webgui/common/exception/AbstractKiekerWebGUIException.java
similarity index 100%
rename from src/main/java/kieker/webgui/common/exception/AbstractKiekerWebGUIException.java
rename to common/src/main/java/kieker/webgui/common/exception/AbstractKiekerWebGUIException.java
diff --git a/src/main/java/kieker/webgui/common/exception/AnalysisDisplayReloadException.java b/common/src/main/java/kieker/webgui/common/exception/AnalysisDisplayReloadException.java
similarity index 100%
rename from src/main/java/kieker/webgui/common/exception/AnalysisDisplayReloadException.java
rename to common/src/main/java/kieker/webgui/common/exception/AnalysisDisplayReloadException.java
diff --git a/src/main/java/kieker/webgui/common/exception/AnalysisInitializationException.java b/common/src/main/java/kieker/webgui/common/exception/AnalysisInitializationException.java
similarity index 100%
rename from src/main/java/kieker/webgui/common/exception/AnalysisInitializationException.java
rename to common/src/main/java/kieker/webgui/common/exception/AnalysisInitializationException.java
diff --git a/src/main/java/kieker/webgui/common/exception/DataAccessException.java b/common/src/main/java/kieker/webgui/common/exception/DataAccessException.java
similarity index 100%
rename from src/main/java/kieker/webgui/common/exception/DataAccessException.java
rename to common/src/main/java/kieker/webgui/common/exception/DataAccessException.java
diff --git a/src/main/java/kieker/webgui/common/exception/GraphLayoutException.java b/common/src/main/java/kieker/webgui/common/exception/GraphLayoutException.java
similarity index 100%
rename from src/main/java/kieker/webgui/common/exception/GraphLayoutException.java
rename to common/src/main/java/kieker/webgui/common/exception/GraphLayoutException.java
diff --git a/src/main/java/kieker/webgui/common/exception/InvalidAnalysisStateException.java b/common/src/main/java/kieker/webgui/common/exception/InvalidAnalysisStateException.java
similarity index 100%
rename from src/main/java/kieker/webgui/common/exception/InvalidAnalysisStateException.java
rename to common/src/main/java/kieker/webgui/common/exception/InvalidAnalysisStateException.java
diff --git a/src/main/java/kieker/webgui/common/exception/NewerProjectException.java b/common/src/main/java/kieker/webgui/common/exception/NewerProjectException.java
similarity index 100%
rename from src/main/java/kieker/webgui/common/exception/NewerProjectException.java
rename to common/src/main/java/kieker/webgui/common/exception/NewerProjectException.java
diff --git a/src/main/java/kieker/webgui/common/exception/ProjectAlreadyExistingException.java b/common/src/main/java/kieker/webgui/common/exception/ProjectAlreadyExistingException.java
similarity index 100%
rename from src/main/java/kieker/webgui/common/exception/ProjectAlreadyExistingException.java
rename to common/src/main/java/kieker/webgui/common/exception/ProjectAlreadyExistingException.java
diff --git a/src/main/java/kieker/webgui/common/exception/ProjectLoadException.java b/common/src/main/java/kieker/webgui/common/exception/ProjectLoadException.java
similarity index 100%
rename from src/main/java/kieker/webgui/common/exception/ProjectLoadException.java
rename to common/src/main/java/kieker/webgui/common/exception/ProjectLoadException.java
diff --git a/src/main/java/kieker/webgui/common/exception/ProjectNotExistingException.java b/common/src/main/java/kieker/webgui/common/exception/ProjectNotExistingException.java
similarity index 100%
rename from src/main/java/kieker/webgui/common/exception/ProjectNotExistingException.java
rename to common/src/main/java/kieker/webgui/common/exception/ProjectNotExistingException.java
diff --git a/src/main/java/kieker/webgui/common/exception/ProjectStillRunningException.java b/common/src/main/java/kieker/webgui/common/exception/ProjectStillRunningException.java
similarity index 100%
rename from src/main/java/kieker/webgui/common/exception/ProjectStillRunningException.java
rename to common/src/main/java/kieker/webgui/common/exception/ProjectStillRunningException.java
diff --git a/src/main/java/kieker/webgui/common/exception/ReflectionException.java b/common/src/main/java/kieker/webgui/common/exception/ReflectionException.java
similarity index 100%
rename from src/main/java/kieker/webgui/common/exception/ReflectionException.java
rename to common/src/main/java/kieker/webgui/common/exception/ReflectionException.java
diff --git a/src/main/java/kieker/webgui/common/exception/UserAlreadyExistingException.java b/common/src/main/java/kieker/webgui/common/exception/UserAlreadyExistingException.java
similarity index 100%
rename from src/main/java/kieker/webgui/common/exception/UserAlreadyExistingException.java
rename to common/src/main/java/kieker/webgui/common/exception/UserAlreadyExistingException.java
diff --git a/src/main/java/kieker/webgui/common/exception/package-info.java b/common/src/main/java/kieker/webgui/common/exception/package-info.java
similarity index 100%
rename from src/main/java/kieker/webgui/common/exception/package-info.java
rename to common/src/main/java/kieker/webgui/common/exception/package-info.java
diff --git a/src/main/java/kieker/webgui/common/package-info.java b/common/src/main/java/kieker/webgui/common/package-info.java
similarity index 100%
rename from src/main/java/kieker/webgui/common/package-info.java
rename to common/src/main/java/kieker/webgui/common/package-info.java
diff --git a/src/test/java/kieker/webgui/common/ClassAndMethodContainerTest.java b/common/src/test/java/kieker/webgui/common/ClassAndMethodContainerTest.java
similarity index 100%
rename from src/test/java/kieker/webgui/common/ClassAndMethodContainerTest.java
rename to common/src/test/java/kieker/webgui/common/ClassAndMethodContainerTest.java
diff --git a/src/test/java/kieker/webgui/common/EnvironmentLoaderListenerTest.java b/common/src/test/java/kieker/webgui/common/EnvironmentLoaderListenerTest.java
similarity index 100%
rename from src/test/java/kieker/webgui/common/EnvironmentLoaderListenerTest.java
rename to common/src/test/java/kieker/webgui/common/EnvironmentLoaderListenerTest.java
diff --git a/src/test/java/kieker/webgui/common/ExceptionsExtendingAbstractClassTest.java b/common/src/test/java/kieker/webgui/common/ExceptionsExtendingAbstractClassTest.java
similarity index 100%
rename from src/test/java/kieker/webgui/common/ExceptionsExtendingAbstractClassTest.java
rename to common/src/test/java/kieker/webgui/common/ExceptionsExtendingAbstractClassTest.java
diff --git a/domain/build.gradle b/domain/build.gradle
new file mode 100644
index 0000000000000000000000000000000000000000..4d7d4dc3136c31db1289225f42dbda2da18418d7
--- /dev/null
+++ b/domain/build.gradle
@@ -0,0 +1,6 @@
+apply plugin: 'eclipse'
+apply plugin: 'java'
+
+dependencies {
+	compile 'net.kieker-monitoring:kieker:1.12:emf'
+}
\ No newline at end of file
diff --git a/src/main/java/kieker/webgui/domain/ComponentListContainer.java b/domain/src/main/java/kieker/webgui/domain/ComponentListContainer.java
similarity index 100%
rename from src/main/java/kieker/webgui/domain/ComponentListContainer.java
rename to domain/src/main/java/kieker/webgui/domain/ComponentListContainer.java
diff --git a/src/main/java/kieker/webgui/domain/DisplayType.java b/domain/src/main/java/kieker/webgui/domain/DisplayType.java
similarity index 100%
rename from src/main/java/kieker/webgui/domain/DisplayType.java
rename to domain/src/main/java/kieker/webgui/domain/DisplayType.java
diff --git a/src/main/java/kieker/webgui/domain/Role.java b/domain/src/main/java/kieker/webgui/domain/Role.java
similarity index 100%
rename from src/main/java/kieker/webgui/domain/Role.java
rename to domain/src/main/java/kieker/webgui/domain/Role.java
diff --git a/src/main/java/kieker/webgui/domain/User.java b/domain/src/main/java/kieker/webgui/domain/User.java
similarity index 100%
rename from src/main/java/kieker/webgui/domain/User.java
rename to domain/src/main/java/kieker/webgui/domain/User.java
diff --git a/src/main/java/kieker/webgui/domain/package-info.java b/domain/src/main/java/kieker/webgui/domain/package-info.java
similarity index 100%
rename from src/main/java/kieker/webgui/domain/package-info.java
rename to domain/src/main/java/kieker/webgui/domain/package-info.java
diff --git a/src/main/java/kieker/webgui/domain/pluginDecorators/AbstractAnalysisComponentDecorator.java b/domain/src/main/java/kieker/webgui/domain/pluginDecorators/AbstractAnalysisComponentDecorator.java
similarity index 100%
rename from src/main/java/kieker/webgui/domain/pluginDecorators/AbstractAnalysisComponentDecorator.java
rename to domain/src/main/java/kieker/webgui/domain/pluginDecorators/AbstractAnalysisComponentDecorator.java
diff --git a/src/main/java/kieker/webgui/domain/pluginDecorators/AbstractPluginDecorator.java b/domain/src/main/java/kieker/webgui/domain/pluginDecorators/AbstractPluginDecorator.java
similarity index 100%
rename from src/main/java/kieker/webgui/domain/pluginDecorators/AbstractPluginDecorator.java
rename to domain/src/main/java/kieker/webgui/domain/pluginDecorators/AbstractPluginDecorator.java
diff --git a/src/main/java/kieker/webgui/domain/pluginDecorators/FilterDecorator.java b/domain/src/main/java/kieker/webgui/domain/pluginDecorators/FilterDecorator.java
similarity index 100%
rename from src/main/java/kieker/webgui/domain/pluginDecorators/FilterDecorator.java
rename to domain/src/main/java/kieker/webgui/domain/pluginDecorators/FilterDecorator.java
diff --git a/src/main/java/kieker/webgui/domain/pluginDecorators/ReaderDecorator.java b/domain/src/main/java/kieker/webgui/domain/pluginDecorators/ReaderDecorator.java
similarity index 100%
rename from src/main/java/kieker/webgui/domain/pluginDecorators/ReaderDecorator.java
rename to domain/src/main/java/kieker/webgui/domain/pluginDecorators/ReaderDecorator.java
diff --git a/src/main/java/kieker/webgui/domain/pluginDecorators/RepositoryDecorator.java b/domain/src/main/java/kieker/webgui/domain/pluginDecorators/RepositoryDecorator.java
similarity index 100%
rename from src/main/java/kieker/webgui/domain/pluginDecorators/RepositoryDecorator.java
rename to domain/src/main/java/kieker/webgui/domain/pluginDecorators/RepositoryDecorator.java
diff --git a/src/main/java/kieker/webgui/domain/pluginDecorators/VisualizationDecorator.java b/domain/src/main/java/kieker/webgui/domain/pluginDecorators/VisualizationDecorator.java
similarity index 100%
rename from src/main/java/kieker/webgui/domain/pluginDecorators/VisualizationDecorator.java
rename to domain/src/main/java/kieker/webgui/domain/pluginDecorators/VisualizationDecorator.java
diff --git a/src/main/java/kieker/webgui/domain/pluginDecorators/package-info.java b/domain/src/main/java/kieker/webgui/domain/pluginDecorators/package-info.java
similarity index 100%
rename from src/main/java/kieker/webgui/domain/pluginDecorators/package-info.java
rename to domain/src/main/java/kieker/webgui/domain/pluginDecorators/package-info.java
diff --git a/lib/kieker-1.12_emf.LICENSE b/lib/kieker-1.12_emf.LICENSE
new file mode 100644
index 0000000000000000000000000000000000000000..05befe59f4355fce50e61fcf81238f55bbbe40e6
--- /dev/null
+++ b/lib/kieker-1.12_emf.LICENSE
@@ -0,0 +1,714 @@
+The Apache Software License - ASL - v2.0
+Project: http://kieker-monitoring.net/
+Description: Kieker
+License: http://www.apache.org/licenses/LICENSE-2.0.txt
+
+The Apache Software License - ASL - v2.0
+License: http://www.apache.org/licenses/LICENSE-2.0.txt
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
+
+APACHE TOMCAT SUBCOMPONENTS: 
+
+Apache Tomcat includes a number of subcomponents with separate copyright notices
+and license terms. Your use of these subcomponents is subject to the terms and
+conditions of the following licenses. 
+
+
+For the jasper-jdt.jar component:
+
+Eclipse Public License - v 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
+CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+a) in the case of the initial Contributor, the initial code and documentation
+distributed under this Agreement, and
+
+b) in the case of each subsequent Contributor:
+
+i) changes to the Program, and
+
+ii) additions to the Program;
+
+where such changes and/or additions to the Program originate from and are
+distributed by that particular Contributor. A Contribution 'originates' from a
+Contributor if it was added to the Program by such Contributor itself or anyone
+acting on such Contributor's behalf. Contributions do not include additions to
+the Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii) are not
+derivative works of the Program.
+
+"Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents" mean patent claims licensable by a Contributor which are
+necessarily infringed by the use or sale of its Contribution alone or when
+combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement,
+including all Contributors.
+
+2. GRANT OF RIGHTS
+
+a) Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide, royalty-free copyright license to
+reproduce, prepare derivative works of, publicly display, publicly perform,
+distribute and sublicense the Contribution of such Contributor, if any, and such
+derivative works, in source code and object code form.
+
+b) Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed
+Patents to make, use, sell, offer to sell, import and otherwise transfer the
+Contribution of such Contributor, if any, in source code and object code form.
+This patent license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor, such
+addition of the Contribution causes such combination to be covered by the
+Licensed Patents. The patent license shall not apply to any other combinations
+which include the Contribution. No hardware per se is licensed hereunder.
+
+c) Recipient understands that although each Contributor grants the licenses to
+its Contributions set forth herein, no assurances are provided by any
+Contributor that the Program does not infringe the patent or other intellectual
+property rights of any other entity. Each Contributor disclaims any liability to
+Recipient for claims brought by any other entity based on infringement of
+intellectual property rights or otherwise. As a condition to exercising the
+rights and licenses granted hereunder, each Recipient hereby assumes sole
+responsibility to secure any other intellectual property rights needed, if any.
+For example, if a third party patent license is required to allow Recipient to
+distribute the Program, it is Recipient's responsibility to acquire that license
+before distributing the Program.
+
+d) Each Contributor represents that to its knowledge it has sufficient copyright
+rights in its Contribution, if any, to grant the copyright license set forth in
+this Agreement.
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under its
+own license agreement, provided that:
+
+a) it complies with the terms and conditions of this Agreement; and
+
+b) its license agreement:
+
+i) effectively disclaims on behalf of all Contributors all warranties and
+conditions, express and implied, including warranties or conditions of title and
+non-infringement, and implied warranties or conditions of merchantability and
+fitness for a particular purpose;
+
+ii) effectively excludes on behalf of all Contributors all liability for
+damages, including direct, indirect, special, incidental and consequential
+damages, such as lost profits;
+
+iii) states that any provisions which differ from this Agreement are offered by
+that Contributor alone and not by any other party; and
+
+iv) states that source code for the Program is available from such Contributor,
+and informs licensees how to obtain it in a reasonable manner on or through a
+medium customarily used for software exchange.
+
+When the Program is made available in source code form:
+
+a) it must be made available under this Agreement; and
+
+b) a copy of this Agreement must be included with each copy of the Program.
+
+Contributors may not remove or alter any copyright notices contained within the
+Program.
+
+Each Contributor must identify itself as the originator of its Contribution, if
+any, in a manner that reasonably allows subsequent Recipients to identify the
+originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with
+respect to end users, business partners and the like. While this license is
+intended to facilitate the commercial use of the Program, the Contributor who
+includes the Program in a commercial product offering should do so in a manner
+which does not create potential liability for other Contributors. Therefore, if
+a Contributor includes the Program in a commercial product offering, such
+Contributor ("Commercial Contributor") hereby agrees to defend and indemnify
+every other Contributor ("Indemnified Contributor") against any losses, damages
+and costs (collectively "Losses") arising from claims, lawsuits and other legal
+actions brought by a third party against the Indemnified Contributor to the
+extent caused by the acts or omissions of such Commercial Contributor in
+connection with its distribution of the Program in a commercial product
+offering. The obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In order
+to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
+Contributor in writing of such claim, and b) allow the Commercial Contributor
+to control, and cooperate with the Commercial Contributor in, the defense and
+any related settlement negotiations. The Indemnified Contributor may
+participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial product
+offering, Product X. That Contributor is then a Commercial Contributor. If that
+Commercial Contributor then makes performance claims, or offers warranties
+related to Product X, those performance claims and warranties are such
+Commercial Contributor's responsibility alone. Under this section, the
+Commercial Contributor would have to defend claims against the other
+Contributors related to those performance claims and warranties, and if a court
+requires any other Contributor to pay any damages as a result, the Commercial
+Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
+IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
+NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each
+Recipient is solely responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its exercise of
+rights under this Agreement , including but not limited to the risks and costs
+of program errors, compliance with applicable laws, damage to or loss of data,
+programs or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
+CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
+PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
+GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under applicable
+law, it shall not affect the validity or enforceability of the remainder of the
+terms of this Agreement, and without further action by the parties hereto, such
+provision shall be reformed to the minimum extent necessary to make such
+provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Program itself
+(excluding combinations of the Program with other software or hardware)
+infringes such Recipient's patent(s), then such Recipient's rights granted under
+Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to
+comply with any of the material terms or conditions of this Agreement and does
+not cure such failure in a reasonable period of time after becoming aware of
+such noncompliance. If all Recipient's rights under this Agreement terminate,
+Recipient agrees to cease use and distribution of the Program as soon as
+reasonably practicable. However, Recipient's obligations under this Agreement
+and any licenses granted by Recipient relating to the Program shall continue and
+survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in
+order to avoid inconsistency the Agreement is copyrighted and may only be
+modified in the following manner. The Agreement Steward reserves the right to
+publish new versions (including revisions) of this Agreement from time to time.
+No one other than the Agreement Steward has the right to modify this Agreement.
+The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation
+may assign the responsibility to serve as the Agreement Steward to a suitable
+separate entity. Each new version of the Agreement will be given a
+distinguishing version number. The Program (including Contributions) may always
+be distributed subject to the version of the Agreement under which it was
+received. In addition, after a new version of the Agreement is published,
+Contributor may elect to distribute the Program (including its Contributions)
+under the new version. Except as expressly stated in Sections 2(a) and 2(b)
+above, Recipient receives no rights or licenses to the intellectual property of
+any Contributor under this Agreement, whether expressly, by implication,
+estoppel or otherwise. All rights in the Program not expressly granted under
+this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the
+intellectual property laws of the United States of America. No party to this
+Agreement will bring a legal action under this Agreement more than one year
+after the cause of action arose. Each party waives its rights to a jury trial in
+any resulting litigation.
+
+
+For the Windows Installer component:
+
+    * All NSIS source code, plug-ins, documentation, examples, header files and
+       graphics, with the exception of the compression modules and where
+       otherwise noted, are licensed under the zlib/libpng license.
+    * The zlib compression module for NSIS is licensed under the zlib/libpng
+       license.
+    * The bzip2 compression module for NSIS is licensed under the bzip2 license.
+    * The lzma compression module for NSIS is licensed under the Common Public
+       License version 1.0. 
+
+zlib/libpng license
+
+This software is provided 'as-is', without any express or implied warranty. In
+no event will the authors be held liable for any damages arising from the use of
+this software.
+
+Permission is granted to anyone to use this software for any purpose, including
+commercial applications, and to alter it and redistribute it freely, subject to
+the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you must not claim
+       that you wrote the original software. If you use this software in a
+       product, an acknowledgment in the product documentation would be
+       appreciated but is not required.
+   2. Altered source versions must be plainly marked as such, and must not be
+       misrepresented as being the original software.
+   3. This notice may not be removed or altered from any source distribution. 
+
+bzip2 license
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+   1. Redistributions of source code must retain the above copyright notice,
+       this list of conditions and the following disclaimer.
+   2. The origin of this software must not be misrepresented; you must not claim
+       that you wrote the original software. If you use this software in a
+       product, an acknowledgment in the product documentation would be
+       appreciated but is not required.
+   3. Altered source versions must be plainly marked as such, and must not be
+       misrepresented as being the original software.
+   4. The name of the author may not be used to endorse or promote products
+       derived from this software without specific prior written permission. 
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+OF SUCH DAMAGE.
+
+Julian Seward, Cambridge, UK.
+
+jseward@acm.org
+Common Public License version 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC
+LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
+CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+a) in the case of the initial Contributor, the initial code and documentation
+distributed under this Agreement, and b) in the case of each subsequent
+Contributor:
+
+i) changes to the Program, and
+
+ii) additions to the Program;
+
+where such changes and/or additions to the Program originate from and are
+distributed by that particular Contributor. A Contribution 'originates' from a
+Contributor if it was added to the Program by such Contributor itself or anyone
+acting on such Contributor's behalf. Contributions do not include additions to
+the Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii) are not
+derivative works of the Program.
+
+"Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents " mean patent claims licensable by a Contributor which are
+necessarily infringed by the use or sale of its Contribution alone or when
+combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement,
+including all Contributors.
+
+2. GRANT OF RIGHTS
+
+a) Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide, royalty-free copyright license to
+reproduce, prepare derivative works of, publicly display, publicly perform,
+distribute and sublicense the Contribution of such Contributor, if any, and such
+derivative works, in source code and object code form.
+
+b) Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed
+Patents to make, use, sell, offer to sell, import and otherwise transfer the
+Contribution of such Contributor, if any, in source code and object code form.
+This patent license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor, such
+addition of the Contribution causes such combination to be covered by the
+Licensed Patents. The patent license shall not apply to any other combinations
+which include the Contribution. No hardware per se is licensed hereunder.
+
+c) Recipient understands that although each Contributor grants the licenses to
+its Contributions set forth herein, no assurances are provided by any
+Contributor that the Program does not infringe the patent or other intellectual
+property rights of any other entity. Each Contributor disclaims any liability to
+Recipient for claims brought by any other entity based on infringement of
+intellectual property rights or otherwise. As a condition to exercising the
+rights and licenses granted hereunder, each Recipient hereby assumes sole
+responsibility to secure any other intellectual property rights needed, if any.
+For example, if a third party patent license is required to allow Recipient to
+distribute the Program, it is Recipient's responsibility to acquire that license
+before distributing the Program.
+
+d) Each Contributor represents that to its knowledge it has sufficient copyright
+rights in its Contribution, if any, to grant the copyright license set forth in
+this Agreement.
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under its
+own license agreement, provided that:
+
+a) it complies with the terms and conditions of this Agreement; and
+
+b) its license agreement:
+
+i) effectively disclaims on behalf of all Contributors all warranties and
+conditions, express and implied, including warranties or conditions of title and
+non-infringement, and implied warranties or conditions of merchantability and
+fitness for a particular purpose;
+
+ii) effectively excludes on behalf of all Contributors all liability for
+damages, including direct, indirect, special, incidental and consequential
+damages, such as lost profits;
+
+iii) states that any provisions which differ from this Agreement are offered by
+that Contributor alone and not by any other party; and
+
+iv) states that source code for the Program is available from such Contributor,
+and informs licensees how to obtain it in a reasonable manner on or through a
+medium customarily used for software exchange.
+
+When the Program is made available in source code form:
+
+a) it must be made available under this Agreement; and
+
+b) a copy of this Agreement must be included with each copy of the Program.
+
+Contributors may not remove or alter any copyright notices contained within the
+Program.
+
+Each Contributor must identify itself as the originator of its Contribution, if
+any, in a manner that reasonably allows subsequent Recipients to identify the
+originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with
+respect to end users, business partners and the like. While this license is
+intended to facilitate the commercial use of the Program, the Contributor who
+includes the Program in a commercial product offering should do so in a manner
+which does not create potential liability for other Contributors. Therefore, if
+a Contributor includes the Program in a commercial product offering, such
+Contributor ("Commercial Contributor") hereby agrees to defend and indemnify
+every other Contributor ("Indemnified Contributor") against any losses, damages
+and costs (collectively "Losses") arising from claims, lawsuits and other legal
+actions brought by a third party against the Indemnified Contributor to the
+extent caused by the acts or omissions of such Commercial Contributor in
+connection with its distribution of the Program in a commercial product
+offering. The obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In order
+to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
+Contributor in writing of such claim, and b) allow the Commercial Contributor to
+control, and cooperate with the Commercial Contributor in, the defense and any
+related settlement negotiations. The Indemnified Contributor may participate in
+any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial product
+offering, Product X. That Contributor is then a Commercial Contributor. If that
+Commercial Contributor then makes performance claims, or offers warranties
+related to Product X, those performance claims and warranties are such
+Commercial Contributor's responsibility alone. Under this section, the
+Commercial Contributor would have to defend claims against the other
+Contributors related to those performance claims and warranties, and if a court
+requires any other Contributor to pay any damages as a result, the Commercial
+Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
+IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
+NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each
+Recipient is solely responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its exercise of
+rights under this Agreement, including but not limited to the risks and costs of
+program errors, compliance with applicable laws, damage to or loss of data,
+programs or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
+CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
+PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
+GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under applicable
+law, it shall not affect the validity or enforceability of the remainder of the
+terms of this Agreement, and without further action by the parties hereto, such
+provision shall be reformed to the minimum extent necessary to make such
+provision valid and enforceable.
+
+If Recipient institutes patent litigation against a Contributor with respect to
+a patent applicable to software (including a cross-claim or counterclaim in a
+lawsuit), then any patent licenses granted by that Contributor to such Recipient
+under this Agreement shall terminate as of the date such litigation is filed. In
+addition, if Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the Program
+itself (excluding combinations of the Program with other software or hardware)
+infringes such Recipient's patent(s), then such Recipient's rights granted under
+Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to
+comply with any of the material terms or conditions of this Agreement and does
+not cure such failure in a reasonable period of time after becoming aware of
+such noncompliance. If all Recipient's rights under this Agreement terminate,
+Recipient agrees to cease use and distribution of the Program as soon as
+reasonably practicable. However, Recipient's obligations under this Agreement
+and any licenses granted by Recipient relating to the Program shall continue and
+survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in
+order to avoid inconsistency the Agreement is copyrighted and may only be
+modified in the following manner. The Agreement Steward reserves the right to
+publish new versions (including revisions) of this Agreement from time to time.
+No one other than the Agreement Steward has the right to modify this Agreement.
+IBM is the initial Agreement Steward. IBM may assign the responsibility to serve
+as the Agreement Steward to a suitable separate entity. Each new version of the
+Agreement will be given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the Agreement
+under which it was received. In addition, after a new version of the Agreement
+is published, Contributor may elect to distribute the Program (including its
+Contributions) under the new version. Except as expressly stated in Sections
+2(a) and 2(b) above, Recipient receives no rights or licenses to the
+intellectual property of any Contributor under this Agreement, whether
+expressly, by implication, estoppel or otherwise. All rights in the Program not
+expressly granted under this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the
+intellectual property laws of the United States of America. No party to this
+Agreement will bring a legal action under this Agreement more than one year
+after the cause of action arose. Each party waives its rights to a jury trial in
+any resulting litigation.
+
+Special exception for LZMA compression module
+
+Igor Pavlov and Amir Szekely, the authors of the LZMA compression module for
+NSIS, expressly permit you to statically or dynamically link your code (or bind
+by name) to the files from the LZMA compression module for NSIS without
+subjecting your linked code to the terms of the Common Public license version
+1.0. Any modifications or additions to files from the LZMA compression module
+for NSIS, however, are subject to the terms of the Common Public License version
+1.0. 
diff --git a/persistence/build.gradle b/persistence/build.gradle
new file mode 100644
index 0000000000000000000000000000000000000000..fece21dd7f60c5a9e5089e84e0f00b6293a3213c
--- /dev/null
+++ b/persistence/build.gradle
@@ -0,0 +1,13 @@
+apply plugin: 'eclipse'
+apply plugin: 'java'
+
+dependencies {
+	compile project(':domain')
+	compile project(':common')
+	
+	compile 'org.primefaces:primefaces:3.5'
+	compile 'org.springframework.security:spring-security-web:3.1.2.RELEASE'
+	compile 'com.google.guava:guava:14.0.1'
+	compile 'com.google.code.findbugs:jsr305:2.0.1'
+	compile 'net.vidageek:mirror:1.6.1'
+}
\ No newline at end of file
diff --git a/src/main/java/kieker/webgui/persistence/IProjectDAO.java b/persistence/src/main/java/kieker/webgui/persistence/IProjectDAO.java
similarity index 100%
rename from src/main/java/kieker/webgui/persistence/IProjectDAO.java
rename to persistence/src/main/java/kieker/webgui/persistence/IProjectDAO.java
diff --git a/src/main/java/kieker/webgui/persistence/IUserDAO.java b/persistence/src/main/java/kieker/webgui/persistence/IUserDAO.java
similarity index 100%
rename from src/main/java/kieker/webgui/persistence/IUserDAO.java
rename to persistence/src/main/java/kieker/webgui/persistence/IUserDAO.java
diff --git a/src/main/java/kieker/webgui/persistence/impl/DerbyUserDAOImpl.java b/persistence/src/main/java/kieker/webgui/persistence/impl/DerbyUserDAOImpl.java
similarity index 100%
rename from src/main/java/kieker/webgui/persistence/impl/DerbyUserDAOImpl.java
rename to persistence/src/main/java/kieker/webgui/persistence/impl/DerbyUserDAOImpl.java
diff --git a/src/main/java/kieker/webgui/persistence/impl/FSProjectDAOImpl.java b/persistence/src/main/java/kieker/webgui/persistence/impl/FSProjectDAOImpl.java
similarity index 100%
rename from src/main/java/kieker/webgui/persistence/impl/FSProjectDAOImpl.java
rename to persistence/src/main/java/kieker/webgui/persistence/impl/FSProjectDAOImpl.java
diff --git a/src/main/java/kieker/webgui/persistence/impl/package-info.java b/persistence/src/main/java/kieker/webgui/persistence/impl/package-info.java
similarity index 100%
rename from src/main/java/kieker/webgui/persistence/impl/package-info.java
rename to persistence/src/main/java/kieker/webgui/persistence/impl/package-info.java
diff --git a/src/main/java/kieker/webgui/persistence/impl/utility/Class2ModelInstanceConverter.java b/persistence/src/main/java/kieker/webgui/persistence/impl/utility/Class2ModelInstanceConverter.java
similarity index 100%
rename from src/main/java/kieker/webgui/persistence/impl/utility/Class2ModelInstanceConverter.java
rename to persistence/src/main/java/kieker/webgui/persistence/impl/utility/Class2ModelInstanceConverter.java
diff --git a/src/main/java/kieker/webgui/persistence/impl/utility/CloseableURLClassLoader.java b/persistence/src/main/java/kieker/webgui/persistence/impl/utility/CloseableURLClassLoader.java
similarity index 100%
rename from src/main/java/kieker/webgui/persistence/impl/utility/CloseableURLClassLoader.java
rename to persistence/src/main/java/kieker/webgui/persistence/impl/utility/CloseableURLClassLoader.java
diff --git a/src/main/java/kieker/webgui/persistence/impl/utility/PluginFinder.java b/persistence/src/main/java/kieker/webgui/persistence/impl/utility/PluginFinder.java
similarity index 100%
rename from src/main/java/kieker/webgui/persistence/impl/utility/PluginFinder.java
rename to persistence/src/main/java/kieker/webgui/persistence/impl/utility/PluginFinder.java
diff --git a/src/main/java/kieker/webgui/persistence/impl/utility/package-info.java b/persistence/src/main/java/kieker/webgui/persistence/impl/utility/package-info.java
similarity index 100%
rename from src/main/java/kieker/webgui/persistence/impl/utility/package-info.java
rename to persistence/src/main/java/kieker/webgui/persistence/impl/utility/package-info.java
diff --git a/src/main/java/kieker/webgui/persistence/package-info.java b/persistence/src/main/java/kieker/webgui/persistence/package-info.java
similarity index 100%
rename from src/main/java/kieker/webgui/persistence/package-info.java
rename to persistence/src/main/java/kieker/webgui/persistence/package-info.java
diff --git a/src/test/java/kieker/webgui/persistence/impl/utility/Class2ModelInstanceConverterTest.java b/persistence/src/test/java/kieker/webgui/persistence/impl/utility/Class2ModelInstanceConverterTest.java
similarity index 100%
rename from src/test/java/kieker/webgui/persistence/impl/utility/Class2ModelInstanceConverterTest.java
rename to persistence/src/test/java/kieker/webgui/persistence/impl/utility/Class2ModelInstanceConverterTest.java
diff --git a/src/test/java/kieker/webgui/persistence/impl/utility/CloseableURLClassLoaderTest.java b/persistence/src/test/java/kieker/webgui/persistence/impl/utility/CloseableURLClassLoaderTest.java
similarity index 100%
rename from src/test/java/kieker/webgui/persistence/impl/utility/CloseableURLClassLoaderTest.java
rename to persistence/src/test/java/kieker/webgui/persistence/impl/utility/CloseableURLClassLoaderTest.java
diff --git a/src/test/java/kieker/webgui/persistence/impl/utility/PluginFinderTest.java b/persistence/src/test/java/kieker/webgui/persistence/impl/utility/PluginFinderTest.java
similarity index 100%
rename from src/test/java/kieker/webgui/persistence/impl/utility/PluginFinderTest.java
rename to persistence/src/test/java/kieker/webgui/persistence/impl/utility/PluginFinderTest.java
diff --git a/service/build.gradle b/service/build.gradle
new file mode 100644
index 0000000000000000000000000000000000000000..ffa3e0cb9c228472ade81b85ff345fcbe5b68c75
--- /dev/null
+++ b/service/build.gradle
@@ -0,0 +1,8 @@
+apply plugin: 'eclipse'
+apply plugin: 'java'
+
+dependencies {
+	compile project(':persistence')
+	
+	compile files('lib/klay_0.2.0.jar')
+}
diff --git a/lib/klay_0.2.0.jar b/service/lib/klay_0.2.0.jar
similarity index 100%
rename from lib/klay_0.2.0.jar
rename to service/lib/klay_0.2.0.jar
diff --git a/src/main/java/kieker/webgui/service/IGraphLayoutService.java b/service/src/main/java/kieker/webgui/service/IGraphLayoutService.java
similarity index 100%
rename from src/main/java/kieker/webgui/service/IGraphLayoutService.java
rename to service/src/main/java/kieker/webgui/service/IGraphLayoutService.java
diff --git a/src/main/java/kieker/webgui/service/IProjectService.java b/service/src/main/java/kieker/webgui/service/IProjectService.java
similarity index 100%
rename from src/main/java/kieker/webgui/service/IProjectService.java
rename to service/src/main/java/kieker/webgui/service/IProjectService.java
diff --git a/src/main/java/kieker/webgui/service/IUserService.java b/service/src/main/java/kieker/webgui/service/IUserService.java
similarity index 100%
rename from src/main/java/kieker/webgui/service/IUserService.java
rename to service/src/main/java/kieker/webgui/service/IUserService.java
diff --git a/src/main/java/kieker/webgui/service/impl/KielerGraphLayoutServiceImpl.java b/service/src/main/java/kieker/webgui/service/impl/KielerGraphLayoutServiceImpl.java
similarity index 100%
rename from src/main/java/kieker/webgui/service/impl/KielerGraphLayoutServiceImpl.java
rename to service/src/main/java/kieker/webgui/service/impl/KielerGraphLayoutServiceImpl.java
diff --git a/src/main/java/kieker/webgui/service/impl/ProjectServiceImpl.java b/service/src/main/java/kieker/webgui/service/impl/ProjectServiceImpl.java
similarity index 100%
rename from src/main/java/kieker/webgui/service/impl/ProjectServiceImpl.java
rename to service/src/main/java/kieker/webgui/service/impl/ProjectServiceImpl.java
diff --git a/src/main/java/kieker/webgui/service/impl/UserServiceImpl.java b/service/src/main/java/kieker/webgui/service/impl/UserServiceImpl.java
similarity index 100%
rename from src/main/java/kieker/webgui/service/impl/UserServiceImpl.java
rename to service/src/main/java/kieker/webgui/service/impl/UserServiceImpl.java
diff --git a/src/main/java/kieker/webgui/service/impl/package-info.java b/service/src/main/java/kieker/webgui/service/impl/package-info.java
similarity index 100%
rename from src/main/java/kieker/webgui/service/impl/package-info.java
rename to service/src/main/java/kieker/webgui/service/impl/package-info.java
diff --git a/src/main/java/kieker/webgui/service/impl/utility/Analysis.java b/service/src/main/java/kieker/webgui/service/impl/utility/Analysis.java
similarity index 100%
rename from src/main/java/kieker/webgui/service/impl/utility/Analysis.java
rename to service/src/main/java/kieker/webgui/service/impl/utility/Analysis.java
diff --git a/src/main/java/kieker/webgui/service/impl/utility/AnalysisManagementService.java b/service/src/main/java/kieker/webgui/service/impl/utility/AnalysisManagementService.java
similarity index 100%
rename from src/main/java/kieker/webgui/service/impl/utility/AnalysisManagementService.java
rename to service/src/main/java/kieker/webgui/service/impl/utility/AnalysisManagementService.java
diff --git a/src/main/java/kieker/webgui/service/impl/utility/KielerInterface.java b/service/src/main/java/kieker/webgui/service/impl/utility/KielerInterface.java
similarity index 100%
rename from src/main/java/kieker/webgui/service/impl/utility/KielerInterface.java
rename to service/src/main/java/kieker/webgui/service/impl/utility/KielerInterface.java
diff --git a/src/main/java/kieker/webgui/service/impl/utility/LockManager.java b/service/src/main/java/kieker/webgui/service/impl/utility/LockManager.java
similarity index 100%
rename from src/main/java/kieker/webgui/service/impl/utility/LockManager.java
rename to service/src/main/java/kieker/webgui/service/impl/utility/LockManager.java
diff --git a/src/main/java/kieker/webgui/service/impl/utility/converter/GraphStringConverter.java b/service/src/main/java/kieker/webgui/service/impl/utility/converter/GraphStringConverter.java
similarity index 100%
rename from src/main/java/kieker/webgui/service/impl/utility/converter/GraphStringConverter.java
rename to service/src/main/java/kieker/webgui/service/impl/utility/converter/GraphStringConverter.java
diff --git a/src/main/java/kieker/webgui/service/impl/utility/converter/ResultStringConverter.java b/service/src/main/java/kieker/webgui/service/impl/utility/converter/ResultStringConverter.java
similarity index 100%
rename from src/main/java/kieker/webgui/service/impl/utility/converter/ResultStringConverter.java
rename to service/src/main/java/kieker/webgui/service/impl/utility/converter/ResultStringConverter.java
diff --git a/src/main/java/kieker/webgui/service/impl/utility/model/Edge.java b/service/src/main/java/kieker/webgui/service/impl/utility/model/Edge.java
similarity index 100%
rename from src/main/java/kieker/webgui/service/impl/utility/model/Edge.java
rename to service/src/main/java/kieker/webgui/service/impl/utility/model/Edge.java
diff --git a/src/main/java/kieker/webgui/service/impl/utility/model/Graph.java b/service/src/main/java/kieker/webgui/service/impl/utility/model/Graph.java
similarity index 100%
rename from src/main/java/kieker/webgui/service/impl/utility/model/Graph.java
rename to service/src/main/java/kieker/webgui/service/impl/utility/model/Graph.java
diff --git a/src/main/java/kieker/webgui/service/impl/utility/model/Node.java b/service/src/main/java/kieker/webgui/service/impl/utility/model/Node.java
similarity index 100%
rename from src/main/java/kieker/webgui/service/impl/utility/model/Node.java
rename to service/src/main/java/kieker/webgui/service/impl/utility/model/Node.java
diff --git a/src/main/java/kieker/webgui/service/impl/utility/model/Point.java b/service/src/main/java/kieker/webgui/service/impl/utility/model/Point.java
similarity index 100%
rename from src/main/java/kieker/webgui/service/impl/utility/model/Point.java
rename to service/src/main/java/kieker/webgui/service/impl/utility/model/Point.java
diff --git a/src/main/java/kieker/webgui/service/impl/utility/model/Port.java b/service/src/main/java/kieker/webgui/service/impl/utility/model/Port.java
similarity index 100%
rename from src/main/java/kieker/webgui/service/impl/utility/model/Port.java
rename to service/src/main/java/kieker/webgui/service/impl/utility/model/Port.java
diff --git a/src/main/java/kieker/webgui/service/impl/utility/package-info.java b/service/src/main/java/kieker/webgui/service/impl/utility/package-info.java
similarity index 100%
rename from src/main/java/kieker/webgui/service/impl/utility/package-info.java
rename to service/src/main/java/kieker/webgui/service/impl/utility/package-info.java
diff --git a/src/main/java/kieker/webgui/service/package-info.java b/service/src/main/java/kieker/webgui/service/package-info.java
similarity index 100%
rename from src/main/java/kieker/webgui/service/package-info.java
rename to service/src/main/java/kieker/webgui/service/package-info.java
diff --git a/src/test/java/kieker/webgui/service/impl/GraphLayoutServiceImplTest.java b/service/src/test/java/kieker/webgui/service/impl/GraphLayoutServiceImplTest.java
similarity index 100%
rename from src/test/java/kieker/webgui/service/impl/GraphLayoutServiceImplTest.java
rename to service/src/test/java/kieker/webgui/service/impl/GraphLayoutServiceImplTest.java
diff --git a/web/build.gradle b/web/build.gradle
new file mode 100644
index 0000000000000000000000000000000000000000..949ab7ddffec6152c265d3bf5f6f8c18ef551ea1
--- /dev/null
+++ b/web/build.gradle
@@ -0,0 +1,16 @@
+apply plugin: 'eclipse'
+apply plugin: 'war'
+
+dependencies {
+	compile project(':service')
+	
+	compile 'javax:javaee-api:6.0'
+	
+	runtime 'com.ocpsoft:prettyfaces-jsf2:3.3.3'
+	runtime 'com.sun.faces:jsf-api:2.1.22'
+	runtime 'com.sun.faces:jsf-impl:2.1.22'	
+	runtime 'commons-io:commons-io:2.4'
+	runtime 'commons-fileupload:commons-fileupload:1.3'
+	runtime 'org.primefaces:primefaces:3.5'
+	runtime 'org.primefaces.themes:all-themes:1.0.9'
+}
\ No newline at end of file
diff --git a/src/main/java/kieker/webgui/web/beans/application/GlobalPropertiesBean.java b/web/src/main/java/kieker/webgui/web/beans/application/GlobalPropertiesBean.java
similarity index 100%
rename from src/main/java/kieker/webgui/web/beans/application/GlobalPropertiesBean.java
rename to web/src/main/java/kieker/webgui/web/beans/application/GlobalPropertiesBean.java
diff --git a/src/main/java/kieker/webgui/web/beans/application/ThemeSwitcherBean.java b/web/src/main/java/kieker/webgui/web/beans/application/ThemeSwitcherBean.java
similarity index 100%
rename from src/main/java/kieker/webgui/web/beans/application/ThemeSwitcherBean.java
rename to web/src/main/java/kieker/webgui/web/beans/application/ThemeSwitcherBean.java
diff --git a/src/main/java/kieker/webgui/web/beans/application/package-info.java b/web/src/main/java/kieker/webgui/web/beans/application/package-info.java
similarity index 100%
rename from src/main/java/kieker/webgui/web/beans/application/package-info.java
rename to web/src/main/java/kieker/webgui/web/beans/application/package-info.java
diff --git a/src/main/java/kieker/webgui/web/beans/request/package-info.java b/web/src/main/java/kieker/webgui/web/beans/request/package-info.java
similarity index 100%
rename from src/main/java/kieker/webgui/web/beans/request/package-info.java
rename to web/src/main/java/kieker/webgui/web/beans/request/package-info.java
diff --git a/src/main/java/kieker/webgui/web/beans/request/project/AbstractProjectBean.java b/web/src/main/java/kieker/webgui/web/beans/request/project/AbstractProjectBean.java
similarity index 100%
rename from src/main/java/kieker/webgui/web/beans/request/project/AbstractProjectBean.java
rename to web/src/main/java/kieker/webgui/web/beans/request/project/AbstractProjectBean.java
diff --git a/src/main/java/kieker/webgui/web/beans/request/project/CopyProjectBean.java b/web/src/main/java/kieker/webgui/web/beans/request/project/CopyProjectBean.java
similarity index 100%
rename from src/main/java/kieker/webgui/web/beans/request/project/CopyProjectBean.java
rename to web/src/main/java/kieker/webgui/web/beans/request/project/CopyProjectBean.java
diff --git a/src/main/java/kieker/webgui/web/beans/request/project/ImportProjectBean.java b/web/src/main/java/kieker/webgui/web/beans/request/project/ImportProjectBean.java
similarity index 100%
rename from src/main/java/kieker/webgui/web/beans/request/project/ImportProjectBean.java
rename to web/src/main/java/kieker/webgui/web/beans/request/project/ImportProjectBean.java
diff --git a/src/main/java/kieker/webgui/web/beans/request/project/NewProjectBean.java b/web/src/main/java/kieker/webgui/web/beans/request/project/NewProjectBean.java
similarity index 100%
rename from src/main/java/kieker/webgui/web/beans/request/project/NewProjectBean.java
rename to web/src/main/java/kieker/webgui/web/beans/request/project/NewProjectBean.java
diff --git a/src/main/java/kieker/webgui/web/beans/request/project/RenameProjectBean.java b/web/src/main/java/kieker/webgui/web/beans/request/project/RenameProjectBean.java
similarity index 100%
rename from src/main/java/kieker/webgui/web/beans/request/project/RenameProjectBean.java
rename to web/src/main/java/kieker/webgui/web/beans/request/project/RenameProjectBean.java
diff --git a/src/main/java/kieker/webgui/web/beans/request/project/package-info.java b/web/src/main/java/kieker/webgui/web/beans/request/project/package-info.java
similarity index 100%
rename from src/main/java/kieker/webgui/web/beans/request/project/package-info.java
rename to web/src/main/java/kieker/webgui/web/beans/request/project/package-info.java
diff --git a/src/main/java/kieker/webgui/web/beans/request/user/AbstractUserBean.java b/web/src/main/java/kieker/webgui/web/beans/request/user/AbstractUserBean.java
similarity index 100%
rename from src/main/java/kieker/webgui/web/beans/request/user/AbstractUserBean.java
rename to web/src/main/java/kieker/webgui/web/beans/request/user/AbstractUserBean.java
diff --git a/src/main/java/kieker/webgui/web/beans/request/user/EditUserBean.java b/web/src/main/java/kieker/webgui/web/beans/request/user/EditUserBean.java
similarity index 100%
rename from src/main/java/kieker/webgui/web/beans/request/user/EditUserBean.java
rename to web/src/main/java/kieker/webgui/web/beans/request/user/EditUserBean.java
diff --git a/src/main/java/kieker/webgui/web/beans/request/user/EditUserPasswordBean.java b/web/src/main/java/kieker/webgui/web/beans/request/user/EditUserPasswordBean.java
similarity index 100%
rename from src/main/java/kieker/webgui/web/beans/request/user/EditUserPasswordBean.java
rename to web/src/main/java/kieker/webgui/web/beans/request/user/EditUserPasswordBean.java
diff --git a/src/main/java/kieker/webgui/web/beans/request/user/NewUserBean.java b/web/src/main/java/kieker/webgui/web/beans/request/user/NewUserBean.java
similarity index 100%
rename from src/main/java/kieker/webgui/web/beans/request/user/NewUserBean.java
rename to web/src/main/java/kieker/webgui/web/beans/request/user/NewUserBean.java
diff --git a/src/main/java/kieker/webgui/web/beans/request/user/package-info.java b/web/src/main/java/kieker/webgui/web/beans/request/user/package-info.java
similarity index 100%
rename from src/main/java/kieker/webgui/web/beans/request/user/package-info.java
rename to web/src/main/java/kieker/webgui/web/beans/request/user/package-info.java
diff --git a/src/main/java/kieker/webgui/web/beans/request/view/AbstractViewBean.java b/web/src/main/java/kieker/webgui/web/beans/request/view/AbstractViewBean.java
similarity index 100%
rename from src/main/java/kieker/webgui/web/beans/request/view/AbstractViewBean.java
rename to web/src/main/java/kieker/webgui/web/beans/request/view/AbstractViewBean.java
diff --git a/src/main/java/kieker/webgui/web/beans/request/view/CopyViewBean.java b/web/src/main/java/kieker/webgui/web/beans/request/view/CopyViewBean.java
similarity index 100%
rename from src/main/java/kieker/webgui/web/beans/request/view/CopyViewBean.java
rename to web/src/main/java/kieker/webgui/web/beans/request/view/CopyViewBean.java
diff --git a/src/main/java/kieker/webgui/web/beans/request/view/EditViewBean.java b/web/src/main/java/kieker/webgui/web/beans/request/view/EditViewBean.java
similarity index 100%
rename from src/main/java/kieker/webgui/web/beans/request/view/EditViewBean.java
rename to web/src/main/java/kieker/webgui/web/beans/request/view/EditViewBean.java
diff --git a/src/main/java/kieker/webgui/web/beans/request/view/NewViewBean.java b/web/src/main/java/kieker/webgui/web/beans/request/view/NewViewBean.java
similarity index 100%
rename from src/main/java/kieker/webgui/web/beans/request/view/NewViewBean.java
rename to web/src/main/java/kieker/webgui/web/beans/request/view/NewViewBean.java
diff --git a/src/main/java/kieker/webgui/web/beans/request/view/package-info.java b/web/src/main/java/kieker/webgui/web/beans/request/view/package-info.java
similarity index 100%
rename from src/main/java/kieker/webgui/web/beans/request/view/package-info.java
rename to web/src/main/java/kieker/webgui/web/beans/request/view/package-info.java
diff --git a/src/main/java/kieker/webgui/web/beans/session/UserBean.java b/web/src/main/java/kieker/webgui/web/beans/session/UserBean.java
similarity index 100%
rename from src/main/java/kieker/webgui/web/beans/session/UserBean.java
rename to web/src/main/java/kieker/webgui/web/beans/session/UserBean.java
diff --git a/src/main/java/kieker/webgui/web/beans/session/package-info.java b/web/src/main/java/kieker/webgui/web/beans/session/package-info.java
similarity index 100%
rename from src/main/java/kieker/webgui/web/beans/session/package-info.java
rename to web/src/main/java/kieker/webgui/web/beans/session/package-info.java
diff --git a/src/main/java/kieker/webgui/web/beans/view/AnalysisEditorBean.java b/web/src/main/java/kieker/webgui/web/beans/view/AnalysisEditorBean.java
similarity index 100%
rename from src/main/java/kieker/webgui/web/beans/view/AnalysisEditorBean.java
rename to web/src/main/java/kieker/webgui/web/beans/view/AnalysisEditorBean.java
diff --git a/src/main/java/kieker/webgui/web/beans/view/AnalysisEditorGraphBean.java b/web/src/main/java/kieker/webgui/web/beans/view/AnalysisEditorGraphBean.java
similarity index 100%
rename from src/main/java/kieker/webgui/web/beans/view/AnalysisEditorGraphBean.java
rename to web/src/main/java/kieker/webgui/web/beans/view/AnalysisEditorGraphBean.java
diff --git a/src/main/java/kieker/webgui/web/beans/view/AnalysisEditorHistoryBean.java b/web/src/main/java/kieker/webgui/web/beans/view/AnalysisEditorHistoryBean.java
similarity index 100%
rename from src/main/java/kieker/webgui/web/beans/view/AnalysisEditorHistoryBean.java
rename to web/src/main/java/kieker/webgui/web/beans/view/AnalysisEditorHistoryBean.java
diff --git a/src/main/java/kieker/webgui/web/beans/view/CockpitBean.java b/web/src/main/java/kieker/webgui/web/beans/view/CockpitBean.java
similarity index 100%
rename from src/main/java/kieker/webgui/web/beans/view/CockpitBean.java
rename to web/src/main/java/kieker/webgui/web/beans/view/CockpitBean.java
diff --git a/src/main/java/kieker/webgui/web/beans/view/CockpitEditorBean.java b/web/src/main/java/kieker/webgui/web/beans/view/CockpitEditorBean.java
similarity index 100%
rename from src/main/java/kieker/webgui/web/beans/view/CockpitEditorBean.java
rename to web/src/main/java/kieker/webgui/web/beans/view/CockpitEditorBean.java
diff --git a/src/main/java/kieker/webgui/web/beans/view/ControllerBean.java b/web/src/main/java/kieker/webgui/web/beans/view/ControllerBean.java
similarity index 100%
rename from src/main/java/kieker/webgui/web/beans/view/ControllerBean.java
rename to web/src/main/java/kieker/webgui/web/beans/view/ControllerBean.java
diff --git a/src/main/java/kieker/webgui/web/beans/view/ProjectOverviewBean.java b/web/src/main/java/kieker/webgui/web/beans/view/ProjectOverviewBean.java
similarity index 100%
rename from src/main/java/kieker/webgui/web/beans/view/ProjectOverviewBean.java
rename to web/src/main/java/kieker/webgui/web/beans/view/ProjectOverviewBean.java
diff --git a/src/main/java/kieker/webgui/web/beans/view/UserManagementBean.java b/web/src/main/java/kieker/webgui/web/beans/view/UserManagementBean.java
similarity index 100%
rename from src/main/java/kieker/webgui/web/beans/view/UserManagementBean.java
rename to web/src/main/java/kieker/webgui/web/beans/view/UserManagementBean.java
diff --git a/src/main/java/kieker/webgui/web/beans/view/package-info.java b/web/src/main/java/kieker/webgui/web/beans/view/package-info.java
similarity index 100%
rename from src/main/java/kieker/webgui/web/beans/view/package-info.java
rename to web/src/main/java/kieker/webgui/web/beans/view/package-info.java
diff --git a/src/main/java/kieker/webgui/web/converter/RoleStringConverter.java b/web/src/main/java/kieker/webgui/web/converter/RoleStringConverter.java
similarity index 100%
rename from src/main/java/kieker/webgui/web/converter/RoleStringConverter.java
rename to web/src/main/java/kieker/webgui/web/converter/RoleStringConverter.java
diff --git a/src/main/java/kieker/webgui/web/converter/package-info.java b/web/src/main/java/kieker/webgui/web/converter/package-info.java
similarity index 100%
rename from src/main/java/kieker/webgui/web/converter/package-info.java
rename to web/src/main/java/kieker/webgui/web/converter/package-info.java
diff --git a/src/main/java/kieker/webgui/web/utility/CockpitLayout.java b/web/src/main/java/kieker/webgui/web/utility/CockpitLayout.java
similarity index 100%
rename from src/main/java/kieker/webgui/web/utility/CockpitLayout.java
rename to web/src/main/java/kieker/webgui/web/utility/CockpitLayout.java
diff --git a/src/main/java/kieker/webgui/web/utility/IGraphListener.java b/web/src/main/java/kieker/webgui/web/utility/IGraphListener.java
similarity index 100%
rename from src/main/java/kieker/webgui/web/utility/IGraphListener.java
rename to web/src/main/java/kieker/webgui/web/utility/IGraphListener.java
diff --git a/src/main/java/kieker/webgui/web/utility/ViewScope.java b/web/src/main/java/kieker/webgui/web/utility/ViewScope.java
similarity index 100%
rename from src/main/java/kieker/webgui/web/utility/ViewScope.java
rename to web/src/main/java/kieker/webgui/web/utility/ViewScope.java
diff --git a/src/main/java/kieker/webgui/web/utility/command/AbstractEditorCommand.java b/web/src/main/java/kieker/webgui/web/utility/command/AbstractEditorCommand.java
similarity index 100%
rename from src/main/java/kieker/webgui/web/utility/command/AbstractEditorCommand.java
rename to web/src/main/java/kieker/webgui/web/utility/command/AbstractEditorCommand.java
diff --git a/src/main/java/kieker/webgui/web/utility/command/AddPluginCommand.java b/web/src/main/java/kieker/webgui/web/utility/command/AddPluginCommand.java
similarity index 100%
rename from src/main/java/kieker/webgui/web/utility/command/AddPluginCommand.java
rename to web/src/main/java/kieker/webgui/web/utility/command/AddPluginCommand.java
diff --git a/src/main/java/kieker/webgui/web/utility/command/DeletePluginCommand.java b/web/src/main/java/kieker/webgui/web/utility/command/DeletePluginCommand.java
similarity index 100%
rename from src/main/java/kieker/webgui/web/utility/command/DeletePluginCommand.java
rename to web/src/main/java/kieker/webgui/web/utility/command/DeletePluginCommand.java
diff --git a/src/main/java/kieker/webgui/web/utility/command/package-info.java b/web/src/main/java/kieker/webgui/web/utility/command/package-info.java
similarity index 100%
rename from src/main/java/kieker/webgui/web/utility/command/package-info.java
rename to web/src/main/java/kieker/webgui/web/utility/command/package-info.java
diff --git a/src/main/java/kieker/webgui/web/utility/displaySettings/IDisplayConnectorSettings.java b/web/src/main/java/kieker/webgui/web/utility/displaySettings/IDisplayConnectorSettings.java
similarity index 100%
rename from src/main/java/kieker/webgui/web/utility/displaySettings/IDisplayConnectorSettings.java
rename to web/src/main/java/kieker/webgui/web/utility/displaySettings/IDisplayConnectorSettings.java
diff --git a/src/main/java/kieker/webgui/web/utility/displaySettings/MeterGaugeDisplaySettings.java b/web/src/main/java/kieker/webgui/web/utility/displaySettings/MeterGaugeDisplaySettings.java
similarity index 100%
rename from src/main/java/kieker/webgui/web/utility/displaySettings/MeterGaugeDisplaySettings.java
rename to web/src/main/java/kieker/webgui/web/utility/displaySettings/MeterGaugeDisplaySettings.java
diff --git a/src/main/java/kieker/webgui/web/utility/displaySettings/PieChartDisplaySettings.java b/web/src/main/java/kieker/webgui/web/utility/displaySettings/PieChartDisplaySettings.java
similarity index 100%
rename from src/main/java/kieker/webgui/web/utility/displaySettings/PieChartDisplaySettings.java
rename to web/src/main/java/kieker/webgui/web/utility/displaySettings/PieChartDisplaySettings.java
diff --git a/src/main/java/kieker/webgui/web/utility/displaySettings/XYPlotDisplaySettings.java b/web/src/main/java/kieker/webgui/web/utility/displaySettings/XYPlotDisplaySettings.java
similarity index 100%
rename from src/main/java/kieker/webgui/web/utility/displaySettings/XYPlotDisplaySettings.java
rename to web/src/main/java/kieker/webgui/web/utility/displaySettings/XYPlotDisplaySettings.java
diff --git a/src/main/java/kieker/webgui/web/utility/displaySettings/package-info.java b/web/src/main/java/kieker/webgui/web/utility/displaySettings/package-info.java
similarity index 100%
rename from src/main/java/kieker/webgui/web/utility/displaySettings/package-info.java
rename to web/src/main/java/kieker/webgui/web/utility/displaySettings/package-info.java
diff --git a/src/main/java/kieker/webgui/web/utility/package-info.java b/web/src/main/java/kieker/webgui/web/utility/package-info.java
similarity index 100%
rename from src/main/java/kieker/webgui/web/utility/package-info.java
rename to web/src/main/java/kieker/webgui/web/utility/package-info.java
diff --git a/src/main/resources/aop.xml b/web/src/main/resources/aop.xml
similarity index 100%
rename from src/main/resources/aop.xml
rename to web/src/main/resources/aop.xml
diff --git a/src/main/resources/global.properties b/web/src/main/resources/global.properties
similarity index 100%
rename from src/main/resources/global.properties
rename to web/src/main/resources/global.properties
diff --git a/src/main/resources/kieker.monitoring.properties b/web/src/main/resources/kieker.monitoring.properties
similarity index 100%
rename from src/main/resources/kieker.monitoring.properties
rename to web/src/main/resources/kieker.monitoring.properties
diff --git a/src/main/resources/lang/AccessDeniedPage_de.properties b/web/src/main/resources/lang/AccessDeniedPage_de.properties
similarity index 100%
rename from src/main/resources/lang/AccessDeniedPage_de.properties
rename to web/src/main/resources/lang/AccessDeniedPage_de.properties
diff --git a/src/main/resources/lang/AccessDeniedPage_en.properties b/web/src/main/resources/lang/AccessDeniedPage_en.properties
similarity index 100%
rename from src/main/resources/lang/AccessDeniedPage_en.properties
rename to web/src/main/resources/lang/AccessDeniedPage_en.properties
diff --git a/src/main/resources/lang/AnalysisEditorPage_de.properties b/web/src/main/resources/lang/AnalysisEditorPage_de.properties
similarity index 100%
rename from src/main/resources/lang/AnalysisEditorPage_de.properties
rename to web/src/main/resources/lang/AnalysisEditorPage_de.properties
diff --git a/src/main/resources/lang/AnalysisEditorPage_en.properties b/web/src/main/resources/lang/AnalysisEditorPage_en.properties
similarity index 100%
rename from src/main/resources/lang/AnalysisEditorPage_en.properties
rename to web/src/main/resources/lang/AnalysisEditorPage_en.properties
diff --git a/src/main/resources/lang/CockpitEditorPage_de.properties b/web/src/main/resources/lang/CockpitEditorPage_de.properties
similarity index 100%
rename from src/main/resources/lang/CockpitEditorPage_de.properties
rename to web/src/main/resources/lang/CockpitEditorPage_de.properties
diff --git a/src/main/resources/lang/CockpitEditorPage_en.properties b/web/src/main/resources/lang/CockpitEditorPage_en.properties
similarity index 100%
rename from src/main/resources/lang/CockpitEditorPage_en.properties
rename to web/src/main/resources/lang/CockpitEditorPage_en.properties
diff --git a/src/main/resources/lang/CockpitPage_de.properties b/web/src/main/resources/lang/CockpitPage_de.properties
similarity index 100%
rename from src/main/resources/lang/CockpitPage_de.properties
rename to web/src/main/resources/lang/CockpitPage_de.properties
diff --git a/src/main/resources/lang/CockpitPage_en.properties b/web/src/main/resources/lang/CockpitPage_en.properties
similarity index 100%
rename from src/main/resources/lang/CockpitPage_en.properties
rename to web/src/main/resources/lang/CockpitPage_en.properties
diff --git a/src/main/resources/lang/Common_de.properties b/web/src/main/resources/lang/Common_de.properties
similarity index 100%
rename from src/main/resources/lang/Common_de.properties
rename to web/src/main/resources/lang/Common_de.properties
diff --git a/src/main/resources/lang/Common_en.properties b/web/src/main/resources/lang/Common_en.properties
similarity index 100%
rename from src/main/resources/lang/Common_en.properties
rename to web/src/main/resources/lang/Common_en.properties
diff --git a/src/main/resources/lang/ControllerPage_de.properties b/web/src/main/resources/lang/ControllerPage_de.properties
similarity index 100%
rename from src/main/resources/lang/ControllerPage_de.properties
rename to web/src/main/resources/lang/ControllerPage_de.properties
diff --git a/src/main/resources/lang/ControllerPage_en.properties b/web/src/main/resources/lang/ControllerPage_en.properties
similarity index 100%
rename from src/main/resources/lang/ControllerPage_en.properties
rename to web/src/main/resources/lang/ControllerPage_en.properties
diff --git a/src/main/resources/lang/LoginPage_de.properties b/web/src/main/resources/lang/LoginPage_de.properties
similarity index 100%
rename from src/main/resources/lang/LoginPage_de.properties
rename to web/src/main/resources/lang/LoginPage_de.properties
diff --git a/src/main/resources/lang/LoginPage_en.properties b/web/src/main/resources/lang/LoginPage_en.properties
similarity index 100%
rename from src/main/resources/lang/LoginPage_en.properties
rename to web/src/main/resources/lang/LoginPage_en.properties
diff --git a/src/main/resources/lang/ProjectOverviewPage_de.properties b/web/src/main/resources/lang/ProjectOverviewPage_de.properties
similarity index 100%
rename from src/main/resources/lang/ProjectOverviewPage_de.properties
rename to web/src/main/resources/lang/ProjectOverviewPage_de.properties
diff --git a/src/main/resources/lang/ProjectOverviewPage_en.properties b/web/src/main/resources/lang/ProjectOverviewPage_en.properties
similarity index 100%
rename from src/main/resources/lang/ProjectOverviewPage_en.properties
rename to web/src/main/resources/lang/ProjectOverviewPage_en.properties
diff --git a/src/main/resources/lang/UserManagementPage_de.properties b/web/src/main/resources/lang/UserManagementPage_de.properties
similarity index 100%
rename from src/main/resources/lang/UserManagementPage_de.properties
rename to web/src/main/resources/lang/UserManagementPage_de.properties
diff --git a/src/main/resources/lang/UserManagementPage_en.properties b/web/src/main/resources/lang/UserManagementPage_en.properties
similarity index 100%
rename from src/main/resources/lang/UserManagementPage_en.properties
rename to web/src/main/resources/lang/UserManagementPage_en.properties
diff --git a/src/main/resources/log4j.properties b/web/src/main/resources/log4j.properties
similarity index 100%
rename from src/main/resources/log4j.properties
rename to web/src/main/resources/log4j.properties
diff --git a/src/main/resources/sql/initial-data.sql b/web/src/main/resources/sql/initial-data.sql
similarity index 100%
rename from src/main/resources/sql/initial-data.sql
rename to web/src/main/resources/sql/initial-data.sql
diff --git a/src/main/resources/sql/tables.sql b/web/src/main/resources/sql/tables.sql
similarity index 100%
rename from src/main/resources/sql/tables.sql
rename to web/src/main/resources/sql/tables.sql
diff --git a/src/main/webapp/AccessDeniedPage.xhtml b/web/src/main/webapp/AccessDeniedPage.xhtml
similarity index 100%
rename from src/main/webapp/AccessDeniedPage.xhtml
rename to web/src/main/webapp/AccessDeniedPage.xhtml
diff --git a/src/main/webapp/LoginPage.xhtml b/web/src/main/webapp/LoginPage.xhtml
similarity index 100%
rename from src/main/webapp/LoginPage.xhtml
rename to web/src/main/webapp/LoginPage.xhtml
diff --git a/src/main/webapp/WEB-INF/faces-config.xml b/web/src/main/webapp/WEB-INF/faces-config.xml
similarity index 100%
rename from src/main/webapp/WEB-INF/faces-config.xml
rename to web/src/main/webapp/WEB-INF/faces-config.xml
diff --git a/src/main/webapp/WEB-INF/jetty-web.xml b/web/src/main/webapp/WEB-INF/jetty-web.xml
similarity index 100%
rename from src/main/webapp/WEB-INF/jetty-web.xml
rename to web/src/main/webapp/WEB-INF/jetty-web.xml
diff --git a/src/main/webapp/WEB-INF/pretty-config.xml b/web/src/main/webapp/WEB-INF/pretty-config.xml
similarity index 100%
rename from src/main/webapp/WEB-INF/pretty-config.xml
rename to web/src/main/webapp/WEB-INF/pretty-config.xml
diff --git a/src/main/webapp/WEB-INF/spring-bean-config.xml b/web/src/main/webapp/WEB-INF/spring-bean-config.xml
similarity index 100%
rename from src/main/webapp/WEB-INF/spring-bean-config.xml
rename to web/src/main/webapp/WEB-INF/spring-bean-config.xml
diff --git a/src/main/webapp/WEB-INF/spring-common-config.xml b/web/src/main/webapp/WEB-INF/spring-common-config.xml
similarity index 100%
rename from src/main/webapp/WEB-INF/spring-common-config.xml
rename to web/src/main/webapp/WEB-INF/spring-common-config.xml
diff --git a/src/main/webapp/WEB-INF/spring-database-config.xml b/web/src/main/webapp/WEB-INF/spring-database-config.xml
similarity index 100%
rename from src/main/webapp/WEB-INF/spring-database-config.xml
rename to web/src/main/webapp/WEB-INF/spring-database-config.xml
diff --git a/src/main/webapp/WEB-INF/spring-security-config.xml b/web/src/main/webapp/WEB-INF/spring-security-config.xml
similarity index 100%
rename from src/main/webapp/WEB-INF/spring-security-config.xml
rename to web/src/main/webapp/WEB-INF/spring-security-config.xml
diff --git a/src/main/webapp/WEB-INF/spring-security-taglib.xml b/web/src/main/webapp/WEB-INF/spring-security-taglib.xml
similarity index 100%
rename from src/main/webapp/WEB-INF/spring-security-taglib.xml
rename to web/src/main/webapp/WEB-INF/spring-security-taglib.xml
diff --git a/src/main/webapp/WEB-INF/web.xml b/web/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from src/main/webapp/WEB-INF/web.xml
rename to web/src/main/webapp/WEB-INF/web.xml
diff --git a/src/main/webapp/css/AccessDeniedPage.css b/web/src/main/webapp/css/AccessDeniedPage.css
similarity index 100%
rename from src/main/webapp/css/AccessDeniedPage.css
rename to web/src/main/webapp/css/AccessDeniedPage.css
diff --git a/src/main/webapp/css/AnalysisEditorPage.css b/web/src/main/webapp/css/AnalysisEditorPage.css
similarity index 100%
rename from src/main/webapp/css/AnalysisEditorPage.css
rename to web/src/main/webapp/css/AnalysisEditorPage.css
diff --git a/src/main/webapp/css/CockpitEditorPage.css b/web/src/main/webapp/css/CockpitEditorPage.css
similarity index 100%
rename from src/main/webapp/css/CockpitEditorPage.css
rename to web/src/main/webapp/css/CockpitEditorPage.css
diff --git a/src/main/webapp/css/CockpitPage.css b/web/src/main/webapp/css/CockpitPage.css
similarity index 100%
rename from src/main/webapp/css/CockpitPage.css
rename to web/src/main/webapp/css/CockpitPage.css
diff --git a/src/main/webapp/css/Common.css b/web/src/main/webapp/css/Common.css
similarity index 100%
rename from src/main/webapp/css/Common.css
rename to web/src/main/webapp/css/Common.css
diff --git a/src/main/webapp/css/ControllerPage.css b/web/src/main/webapp/css/ControllerPage.css
similarity index 100%
rename from src/main/webapp/css/ControllerPage.css
rename to web/src/main/webapp/css/ControllerPage.css
diff --git a/src/main/webapp/css/DefaultTemplate.css b/web/src/main/webapp/css/DefaultTemplate.css
similarity index 100%
rename from src/main/webapp/css/DefaultTemplate.css
rename to web/src/main/webapp/css/DefaultTemplate.css
diff --git a/src/main/webapp/css/FlowEditor.css b/web/src/main/webapp/css/FlowEditor.css
similarity index 100%
rename from src/main/webapp/css/FlowEditor.css
rename to web/src/main/webapp/css/FlowEditor.css
diff --git a/src/main/webapp/css/Icons.css b/web/src/main/webapp/css/Icons.css
similarity index 100%
rename from src/main/webapp/css/Icons.css
rename to web/src/main/webapp/css/Icons.css
diff --git a/src/main/webapp/css/LoginPage.css b/web/src/main/webapp/css/LoginPage.css
similarity index 100%
rename from src/main/webapp/css/LoginPage.css
rename to web/src/main/webapp/css/LoginPage.css
diff --git a/src/main/webapp/css/ProjectOverviewPage.css b/web/src/main/webapp/css/ProjectOverviewPage.css
similarity index 100%
rename from src/main/webapp/css/ProjectOverviewPage.css
rename to web/src/main/webapp/css/ProjectOverviewPage.css
diff --git a/src/main/webapp/css/UserManagement.css b/web/src/main/webapp/css/UserManagement.css
similarity index 100%
rename from src/main/webapp/css/UserManagement.css
rename to web/src/main/webapp/css/UserManagement.css
diff --git a/src/main/webapp/dialogs/AboutDialog.xhtml b/web/src/main/webapp/dialogs/AboutDialog.xhtml
similarity index 100%
rename from src/main/webapp/dialogs/AboutDialog.xhtml
rename to web/src/main/webapp/dialogs/AboutDialog.xhtml
diff --git a/src/main/webapp/dialogs/AnalysisEditorPageDialogs.xhtml b/web/src/main/webapp/dialogs/AnalysisEditorPageDialogs.xhtml
similarity index 100%
rename from src/main/webapp/dialogs/AnalysisEditorPageDialogs.xhtml
rename to web/src/main/webapp/dialogs/AnalysisEditorPageDialogs.xhtml
diff --git a/src/main/webapp/dialogs/CockpitEditorPageDialogs.xhtml b/web/src/main/webapp/dialogs/CockpitEditorPageDialogs.xhtml
similarity index 100%
rename from src/main/webapp/dialogs/CockpitEditorPageDialogs.xhtml
rename to web/src/main/webapp/dialogs/CockpitEditorPageDialogs.xhtml
diff --git a/src/main/webapp/dialogs/ControllerPageDialogs.xhtml b/web/src/main/webapp/dialogs/ControllerPageDialogs.xhtml
similarity index 100%
rename from src/main/webapp/dialogs/ControllerPageDialogs.xhtml
rename to web/src/main/webapp/dialogs/ControllerPageDialogs.xhtml
diff --git a/src/main/webapp/dialogs/ProjectOverviewPageDialogs.xhtml b/web/src/main/webapp/dialogs/ProjectOverviewPageDialogs.xhtml
similarity index 100%
rename from src/main/webapp/dialogs/ProjectOverviewPageDialogs.xhtml
rename to web/src/main/webapp/dialogs/ProjectOverviewPageDialogs.xhtml
diff --git a/src/main/webapp/dialogs/SettingsDialog.xhtml b/web/src/main/webapp/dialogs/SettingsDialog.xhtml
similarity index 100%
rename from src/main/webapp/dialogs/SettingsDialog.xhtml
rename to web/src/main/webapp/dialogs/SettingsDialog.xhtml
diff --git a/src/main/webapp/dialogs/UserManagementDialogs.xhtml b/web/src/main/webapp/dialogs/UserManagementDialogs.xhtml
similarity index 100%
rename from src/main/webapp/dialogs/UserManagementDialogs.xhtml
rename to web/src/main/webapp/dialogs/UserManagementDialogs.xhtml
diff --git a/src/main/webapp/img/AccessDenied.png b/web/src/main/webapp/img/AccessDenied.png
similarity index 100%
rename from src/main/webapp/img/AccessDenied.png
rename to web/src/main/webapp/img/AccessDenied.png
diff --git a/src/main/webapp/img/LEDs/Icon_LED_Gray.png b/web/src/main/webapp/img/LEDs/Icon_LED_Gray.png
similarity index 100%
rename from src/main/webapp/img/LEDs/Icon_LED_Gray.png
rename to web/src/main/webapp/img/LEDs/Icon_LED_Gray.png
diff --git a/src/main/webapp/img/LEDs/Icon_LED_Green.png b/web/src/main/webapp/img/LEDs/Icon_LED_Green.png
similarity index 100%
rename from src/main/webapp/img/LEDs/Icon_LED_Green.png
rename to web/src/main/webapp/img/LEDs/Icon_LED_Green.png
diff --git a/src/main/webapp/img/LEDs/Icon_LED_Red.png b/web/src/main/webapp/img/LEDs/Icon_LED_Red.png
similarity index 100%
rename from src/main/webapp/img/LEDs/Icon_LED_Red.png
rename to web/src/main/webapp/img/LEDs/Icon_LED_Red.png
diff --git a/src/main/webapp/img/LEDs/Icon_LED_Yellow.png b/web/src/main/webapp/img/LEDs/Icon_LED_Yellow.png
similarity index 100%
rename from src/main/webapp/img/LEDs/Icon_LED_Yellow.png
rename to web/src/main/webapp/img/LEDs/Icon_LED_Yellow.png
diff --git a/src/main/webapp/img/graphIcons/FilterIcon.png b/web/src/main/webapp/img/graphIcons/FilterIcon.png
similarity index 100%
rename from src/main/webapp/img/graphIcons/FilterIcon.png
rename to web/src/main/webapp/img/graphIcons/FilterIcon.png
diff --git a/src/main/webapp/img/graphIcons/ProjectConfiguration.png b/web/src/main/webapp/img/graphIcons/ProjectConfiguration.png
similarity index 100%
rename from src/main/webapp/img/graphIcons/ProjectConfiguration.png
rename to web/src/main/webapp/img/graphIcons/ProjectConfiguration.png
diff --git a/src/main/webapp/img/graphIcons/ReaderIcon.png b/web/src/main/webapp/img/graphIcons/ReaderIcon.png
similarity index 100%
rename from src/main/webapp/img/graphIcons/ReaderIcon.png
rename to web/src/main/webapp/img/graphIcons/ReaderIcon.png
diff --git a/src/main/webapp/img/graphIcons/RepositoryIcon.png b/web/src/main/webapp/img/graphIcons/RepositoryIcon.png
similarity index 100%
rename from src/main/webapp/img/graphIcons/RepositoryIcon.png
rename to web/src/main/webapp/img/graphIcons/RepositoryIcon.png
diff --git a/src/main/webapp/img/graphIcons/VisualizationIcon.png b/web/src/main/webapp/img/graphIcons/VisualizationIcon.png
similarity index 100%
rename from src/main/webapp/img/graphIcons/VisualizationIcon.png
rename to web/src/main/webapp/img/graphIcons/VisualizationIcon.png
diff --git a/src/main/webapp/img/icons/About.png b/web/src/main/webapp/img/icons/About.png
similarity index 100%
rename from src/main/webapp/img/icons/About.png
rename to web/src/main/webapp/img/icons/About.png
diff --git a/src/main/webapp/img/icons/Analysis.png b/web/src/main/webapp/img/icons/Analysis.png
similarity index 100%
rename from src/main/webapp/img/icons/Analysis.png
rename to web/src/main/webapp/img/icons/Analysis.png
diff --git a/src/main/webapp/img/icons/AnalysisEditor.png b/web/src/main/webapp/img/icons/AnalysisEditor.png
similarity index 100%
rename from src/main/webapp/img/icons/AnalysisEditor.png
rename to web/src/main/webapp/img/icons/AnalysisEditor.png
diff --git a/src/main/webapp/img/icons/AutoLayout.png b/web/src/main/webapp/img/icons/AutoLayout.png
similarity index 100%
rename from src/main/webapp/img/icons/AutoLayout.png
rename to web/src/main/webapp/img/icons/AutoLayout.png
diff --git a/src/main/webapp/img/icons/AutoLayoutSmall.png b/web/src/main/webapp/img/icons/AutoLayoutSmall.png
similarity index 100%
rename from src/main/webapp/img/icons/AutoLayoutSmall.png
rename to web/src/main/webapp/img/icons/AutoLayoutSmall.png
diff --git a/src/main/webapp/img/icons/Close.png b/web/src/main/webapp/img/icons/Close.png
similarity index 100%
rename from src/main/webapp/img/icons/Close.png
rename to web/src/main/webapp/img/icons/Close.png
diff --git a/src/main/webapp/img/icons/Cockpit.png b/web/src/main/webapp/img/icons/Cockpit.png
similarity index 100%
rename from src/main/webapp/img/icons/Cockpit.png
rename to web/src/main/webapp/img/icons/Cockpit.png
diff --git a/src/main/webapp/img/icons/CockpitEditor.png b/web/src/main/webapp/img/icons/CockpitEditor.png
similarity index 100%
rename from src/main/webapp/img/icons/CockpitEditor.png
rename to web/src/main/webapp/img/icons/CockpitEditor.png
diff --git a/src/main/webapp/img/icons/Copy.png b/web/src/main/webapp/img/icons/Copy.png
similarity index 100%
rename from src/main/webapp/img/icons/Copy.png
rename to web/src/main/webapp/img/icons/Copy.png
diff --git a/src/main/webapp/img/icons/CopyProject.png b/web/src/main/webapp/img/icons/CopyProject.png
similarity index 100%
rename from src/main/webapp/img/icons/CopyProject.png
rename to web/src/main/webapp/img/icons/CopyProject.png
diff --git a/src/main/webapp/img/icons/Delete.png b/web/src/main/webapp/img/icons/Delete.png
similarity index 100%
rename from src/main/webapp/img/icons/Delete.png
rename to web/src/main/webapp/img/icons/Delete.png
diff --git a/src/main/webapp/img/icons/DeleteProject.png b/web/src/main/webapp/img/icons/DeleteProject.png
similarity index 100%
rename from src/main/webapp/img/icons/DeleteProject.png
rename to web/src/main/webapp/img/icons/DeleteProject.png
diff --git a/src/main/webapp/img/icons/Edit.png b/web/src/main/webapp/img/icons/Edit.png
similarity index 100%
rename from src/main/webapp/img/icons/Edit.png
rename to web/src/main/webapp/img/icons/Edit.png
diff --git a/src/main/webapp/img/icons/GridDisabled.png b/web/src/main/webapp/img/icons/GridDisabled.png
similarity index 100%
rename from src/main/webapp/img/icons/GridDisabled.png
rename to web/src/main/webapp/img/icons/GridDisabled.png
diff --git a/src/main/webapp/img/icons/GridDisabledSmall.png b/web/src/main/webapp/img/icons/GridDisabledSmall.png
similarity index 100%
rename from src/main/webapp/img/icons/GridDisabledSmall.png
rename to web/src/main/webapp/img/icons/GridDisabledSmall.png
diff --git a/src/main/webapp/img/icons/GridEnabled.png b/web/src/main/webapp/img/icons/GridEnabled.png
similarity index 100%
rename from src/main/webapp/img/icons/GridEnabled.png
rename to web/src/main/webapp/img/icons/GridEnabled.png
diff --git a/src/main/webapp/img/icons/GridEnabledSmall.png b/web/src/main/webapp/img/icons/GridEnabledSmall.png
similarity index 100%
rename from src/main/webapp/img/icons/GridEnabledSmall.png
rename to web/src/main/webapp/img/icons/GridEnabledSmall.png
diff --git a/src/main/webapp/img/icons/Home.png b/web/src/main/webapp/img/icons/Home.png
similarity index 100%
rename from src/main/webapp/img/icons/Home.png
rename to web/src/main/webapp/img/icons/Home.png
diff --git a/src/main/webapp/img/icons/ImportProject.png b/web/src/main/webapp/img/icons/ImportProject.png
similarity index 100%
rename from src/main/webapp/img/icons/ImportProject.png
rename to web/src/main/webapp/img/icons/ImportProject.png
diff --git a/src/main/webapp/img/icons/ImportProjectSmall.png b/web/src/main/webapp/img/icons/ImportProjectSmall.png
similarity index 100%
rename from src/main/webapp/img/icons/ImportProjectSmall.png
rename to web/src/main/webapp/img/icons/ImportProjectSmall.png
diff --git a/src/main/webapp/img/icons/Logout.png b/web/src/main/webapp/img/icons/Logout.png
similarity index 100%
rename from src/main/webapp/img/icons/Logout.png
rename to web/src/main/webapp/img/icons/Logout.png
diff --git a/src/main/webapp/img/icons/ManageLibraries.png b/web/src/main/webapp/img/icons/ManageLibraries.png
similarity index 100%
rename from src/main/webapp/img/icons/ManageLibraries.png
rename to web/src/main/webapp/img/icons/ManageLibraries.png
diff --git a/src/main/webapp/img/icons/ManageLibrariesSmall.png b/web/src/main/webapp/img/icons/ManageLibrariesSmall.png
similarity index 100%
rename from src/main/webapp/img/icons/ManageLibrariesSmall.png
rename to web/src/main/webapp/img/icons/ManageLibrariesSmall.png
diff --git a/src/main/webapp/img/icons/NewProject.png b/web/src/main/webapp/img/icons/NewProject.png
similarity index 100%
rename from src/main/webapp/img/icons/NewProject.png
rename to web/src/main/webapp/img/icons/NewProject.png
diff --git a/src/main/webapp/img/icons/NewProjectSmall.png b/web/src/main/webapp/img/icons/NewProjectSmall.png
similarity index 100%
rename from src/main/webapp/img/icons/NewProjectSmall.png
rename to web/src/main/webapp/img/icons/NewProjectSmall.png
diff --git a/src/main/webapp/img/icons/NewUser.png b/web/src/main/webapp/img/icons/NewUser.png
similarity index 100%
rename from src/main/webapp/img/icons/NewUser.png
rename to web/src/main/webapp/img/icons/NewUser.png
diff --git a/src/main/webapp/img/icons/NewUserSmall.png b/web/src/main/webapp/img/icons/NewUserSmall.png
similarity index 100%
rename from src/main/webapp/img/icons/NewUserSmall.png
rename to web/src/main/webapp/img/icons/NewUserSmall.png
diff --git a/src/main/webapp/img/icons/NewView.png b/web/src/main/webapp/img/icons/NewView.png
similarity index 100%
rename from src/main/webapp/img/icons/NewView.png
rename to web/src/main/webapp/img/icons/NewView.png
diff --git a/src/main/webapp/img/icons/NewViewSmall.png b/web/src/main/webapp/img/icons/NewViewSmall.png
similarity index 100%
rename from src/main/webapp/img/icons/NewViewSmall.png
rename to web/src/main/webapp/img/icons/NewViewSmall.png
diff --git a/src/main/webapp/img/icons/Redo.png b/web/src/main/webapp/img/icons/Redo.png
similarity index 100%
rename from src/main/webapp/img/icons/Redo.png
rename to web/src/main/webapp/img/icons/Redo.png
diff --git a/src/main/webapp/img/icons/RedoSmall.png b/web/src/main/webapp/img/icons/RedoSmall.png
similarity index 100%
rename from src/main/webapp/img/icons/RedoSmall.png
rename to web/src/main/webapp/img/icons/RedoSmall.png
diff --git a/src/main/webapp/img/icons/Reload.png b/web/src/main/webapp/img/icons/Reload.png
similarity index 100%
rename from src/main/webapp/img/icons/Reload.png
rename to web/src/main/webapp/img/icons/Reload.png
diff --git a/src/main/webapp/img/icons/ReloadSmall.png b/web/src/main/webapp/img/icons/ReloadSmall.png
similarity index 100%
rename from src/main/webapp/img/icons/ReloadSmall.png
rename to web/src/main/webapp/img/icons/ReloadSmall.png
diff --git a/src/main/webapp/img/icons/RenameProject.png b/web/src/main/webapp/img/icons/RenameProject.png
similarity index 100%
rename from src/main/webapp/img/icons/RenameProject.png
rename to web/src/main/webapp/img/icons/RenameProject.png
diff --git a/src/main/webapp/img/icons/Save.png b/web/src/main/webapp/img/icons/Save.png
similarity index 100%
rename from src/main/webapp/img/icons/Save.png
rename to web/src/main/webapp/img/icons/Save.png
diff --git a/src/main/webapp/img/icons/SaveAs.png b/web/src/main/webapp/img/icons/SaveAs.png
similarity index 100%
rename from src/main/webapp/img/icons/SaveAs.png
rename to web/src/main/webapp/img/icons/SaveAs.png
diff --git a/src/main/webapp/img/icons/SaveAsSmall.png b/web/src/main/webapp/img/icons/SaveAsSmall.png
similarity index 100%
rename from src/main/webapp/img/icons/SaveAsSmall.png
rename to web/src/main/webapp/img/icons/SaveAsSmall.png
diff --git a/src/main/webapp/img/icons/SaveSmall.png b/web/src/main/webapp/img/icons/SaveSmall.png
similarity index 100%
rename from src/main/webapp/img/icons/SaveSmall.png
rename to web/src/main/webapp/img/icons/SaveSmall.png
diff --git a/src/main/webapp/img/icons/ScaleToFit.png b/web/src/main/webapp/img/icons/ScaleToFit.png
similarity index 100%
rename from src/main/webapp/img/icons/ScaleToFit.png
rename to web/src/main/webapp/img/icons/ScaleToFit.png
diff --git a/src/main/webapp/img/icons/ScaleToFitSmall.png b/web/src/main/webapp/img/icons/ScaleToFitSmall.png
similarity index 100%
rename from src/main/webapp/img/icons/ScaleToFitSmall.png
rename to web/src/main/webapp/img/icons/ScaleToFitSmall.png
diff --git a/src/main/webapp/img/icons/Settings.png b/web/src/main/webapp/img/icons/Settings.png
similarity index 100%
rename from src/main/webapp/img/icons/Settings.png
rename to web/src/main/webapp/img/icons/Settings.png
diff --git a/src/main/webapp/img/icons/SnapDisabled.png b/web/src/main/webapp/img/icons/SnapDisabled.png
similarity index 100%
rename from src/main/webapp/img/icons/SnapDisabled.png
rename to web/src/main/webapp/img/icons/SnapDisabled.png
diff --git a/src/main/webapp/img/icons/SnapDisabledSmall.png b/web/src/main/webapp/img/icons/SnapDisabledSmall.png
similarity index 100%
rename from src/main/webapp/img/icons/SnapDisabledSmall.png
rename to web/src/main/webapp/img/icons/SnapDisabledSmall.png
diff --git a/src/main/webapp/img/icons/SnapEnabled.png b/web/src/main/webapp/img/icons/SnapEnabled.png
similarity index 100%
rename from src/main/webapp/img/icons/SnapEnabled.png
rename to web/src/main/webapp/img/icons/SnapEnabled.png
diff --git a/src/main/webapp/img/icons/SnapEnabledSmall.png b/web/src/main/webapp/img/icons/SnapEnabledSmall.png
similarity index 100%
rename from src/main/webapp/img/icons/SnapEnabledSmall.png
rename to web/src/main/webapp/img/icons/SnapEnabledSmall.png
diff --git a/src/main/webapp/img/icons/Undo.png b/web/src/main/webapp/img/icons/Undo.png
similarity index 100%
rename from src/main/webapp/img/icons/Undo.png
rename to web/src/main/webapp/img/icons/Undo.png
diff --git a/src/main/webapp/img/icons/UndoSmall.png b/web/src/main/webapp/img/icons/UndoSmall.png
similarity index 100%
rename from src/main/webapp/img/icons/UndoSmall.png
rename to web/src/main/webapp/img/icons/UndoSmall.png
diff --git a/src/main/webapp/img/icons/UserGuide.png b/web/src/main/webapp/img/icons/UserGuide.png
similarity index 100%
rename from src/main/webapp/img/icons/UserGuide.png
rename to web/src/main/webapp/img/icons/UserGuide.png
diff --git a/src/main/webapp/img/icons/UserManagement.png b/web/src/main/webapp/img/icons/UserManagement.png
similarity index 100%
rename from src/main/webapp/img/icons/UserManagement.png
rename to web/src/main/webapp/img/icons/UserManagement.png
diff --git a/src/main/webapp/img/icons/gridDisabled.svg b/web/src/main/webapp/img/icons/gridDisabled.svg
similarity index 100%
rename from src/main/webapp/img/icons/gridDisabled.svg
rename to web/src/main/webapp/img/icons/gridDisabled.svg
diff --git a/src/main/webapp/img/icons/gridEnabled.svg b/web/src/main/webapp/img/icons/gridEnabled.svg
similarity index 100%
rename from src/main/webapp/img/icons/gridEnabled.svg
rename to web/src/main/webapp/img/icons/gridEnabled.svg
diff --git a/src/main/webapp/img/kieker-header.png b/web/src/main/webapp/img/kieker-header.png
similarity index 100%
rename from src/main/webapp/img/kieker-header.png
rename to web/src/main/webapp/img/kieker-header.png
diff --git a/src/main/webapp/img/kieker-logo-transparent.png b/web/src/main/webapp/img/kieker-logo-transparent.png
similarity index 100%
rename from src/main/webapp/img/kieker-logo-transparent.png
rename to web/src/main/webapp/img/kieker-logo-transparent.png
diff --git a/src/main/webapp/js/flowEditor.js b/web/src/main/webapp/js/flowEditor.js
similarity index 100%
rename from src/main/webapp/js/flowEditor.js
rename to web/src/main/webapp/js/flowEditor.js
diff --git a/src/main/webapp/js/jit-yc.js b/web/src/main/webapp/js/jit-yc.js
similarity index 100%
rename from src/main/webapp/js/jit-yc.js
rename to web/src/main/webapp/js/jit-yc.js
diff --git a/src/main/webapp/js/jit.js b/web/src/main/webapp/js/jit.js
similarity index 100%
rename from src/main/webapp/js/jit.js
rename to web/src/main/webapp/js/jit.js
diff --git a/src/main/webapp/pages/AnalysisEditorPage.xhtml b/web/src/main/webapp/pages/AnalysisEditorPage.xhtml
similarity index 100%
rename from src/main/webapp/pages/AnalysisEditorPage.xhtml
rename to web/src/main/webapp/pages/AnalysisEditorPage.xhtml
diff --git a/src/main/webapp/pages/CockpitEditorPage.xhtml b/web/src/main/webapp/pages/CockpitEditorPage.xhtml
similarity index 100%
rename from src/main/webapp/pages/CockpitEditorPage.xhtml
rename to web/src/main/webapp/pages/CockpitEditorPage.xhtml
diff --git a/src/main/webapp/pages/CockpitPage.xhtml b/web/src/main/webapp/pages/CockpitPage.xhtml
similarity index 100%
rename from src/main/webapp/pages/CockpitPage.xhtml
rename to web/src/main/webapp/pages/CockpitPage.xhtml
diff --git a/src/main/webapp/pages/ControllerPage.xhtml b/web/src/main/webapp/pages/ControllerPage.xhtml
similarity index 100%
rename from src/main/webapp/pages/ControllerPage.xhtml
rename to web/src/main/webapp/pages/ControllerPage.xhtml
diff --git a/src/main/webapp/pages/ProjectOverviewPage.xhtml b/web/src/main/webapp/pages/ProjectOverviewPage.xhtml
similarity index 100%
rename from src/main/webapp/pages/ProjectOverviewPage.xhtml
rename to web/src/main/webapp/pages/ProjectOverviewPage.xhtml
diff --git a/src/main/webapp/pages/admin/UserManagementPage.xhtml b/web/src/main/webapp/pages/admin/UserManagementPage.xhtml
similarity index 100%
rename from src/main/webapp/pages/admin/UserManagementPage.xhtml
rename to web/src/main/webapp/pages/admin/UserManagementPage.xhtml
diff --git a/src/main/webapp/templates/CommonTemplate.xhtml b/web/src/main/webapp/templates/CommonTemplate.xhtml
similarity index 100%
rename from src/main/webapp/templates/CommonTemplate.xhtml
rename to web/src/main/webapp/templates/CommonTemplate.xhtml
diff --git a/src/main/webapp/templates/DefaultTemplate.xhtml b/web/src/main/webapp/templates/DefaultTemplate.xhtml
similarity index 100%
rename from src/main/webapp/templates/DefaultTemplate.xhtml
rename to web/src/main/webapp/templates/DefaultTemplate.xhtml
diff --git a/src/main/webapp/templates/PagesTemplate.xhtml b/web/src/main/webapp/templates/PagesTemplate.xhtml
similarity index 100%
rename from src/main/webapp/templates/PagesTemplate.xhtml
rename to web/src/main/webapp/templates/PagesTemplate.xhtml
diff --git a/src/test/java/kieker/webgui/web/converter/RoleStringConverterTest.java b/web/src/test/java/kieker/webgui/web/converter/RoleStringConverterTest.java
similarity index 100%
rename from src/test/java/kieker/webgui/web/converter/RoleStringConverterTest.java
rename to web/src/test/java/kieker/webgui/web/converter/RoleStringConverterTest.java
diff --git a/src/test/java/kieker/webgui/web/utility/CockpitLayoutTest.java b/web/src/test/java/kieker/webgui/web/utility/CockpitLayoutTest.java
similarity index 100%
rename from src/test/java/kieker/webgui/web/utility/CockpitLayoutTest.java
rename to web/src/test/java/kieker/webgui/web/utility/CockpitLayoutTest.java