diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..fa471c6
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,73 @@
+This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html].
+
+# Changelog for Smart Executor
+
+## [v2.0.0-SNAPSHOT]
+
+- Migrated Code from OrientDB 2.2.X APIs OrientDB 3.0.X APIs [#16123]
+- Removed SOAP APIs
+- Redesigned HTTP APIs to comply with RESTful architectural style [#12997]
+- Added API to retrieve scheduled tasks [#10780]
+
+
+## [v1.9.0] - 2017-02-15
+
+- Added REST interface to Smart Executor [#5109]
+
+
+## [v1.8.0] - 2017-11-29
+
+- Fixed exception on stop() method [#10064]
+
+
+## [v1.7.0] - 2017-10-09
+
+- Changed TaskUsageRecord use due to changes in model [#9646] [#9647]
+
+
+## [v1.6.0] - 2017-07-25
+
+- Setting explictly the context before running the plugin to avoid wrong context made from quartz thread reuse
+
+
+## [v1.5.0] - 2017-03-16
+
+- Provided access to UUID and iteration number fro a plugin [#6733]
+- Added support to implements Reminiscence for a Scheduled Task [#772]
+- Removed config file support added in release 1.2.0 now available via Reminiscence [#772]
+- Migrated from CouchDB to OrientDB [#6565]
+- Added accountign by using TaskUsageRecord [#6116]
+
+
+## [v1.4.0] - 2016-11-07
+
+- SmartExecutor has been passed to Authorization 2.0 [#4944 #2112]
+- Provided to plugins the possibility to specify progress percentage [#440]
+- >Provided to plugins the possibility to define a custom notifier [#5089]
+
+
+
+## [v1.3.0] - 2016-02-08
+
+- Using Persistence (CouchDB] to save Scheduled Task configuration [#579]
+- Added Unscheduling feature for repetitive task [#521]
+
+
+## [v1.2.0] - 2015-12-31
+
+- Removed Support for Config File to run task at service startup
+
+
+## [v1.1.0] - 2015-12-09
+
+- Added Support for Config File to run task at service startup [#508]
+- Added Recurrent and Scheduled Task support [#111]
+- Saving Task Evolution on Persistence (CouchDB) [#89]
+
+
+
+## [v1.0.0] - 2015-02-05
+
+- First Release
+
+
diff --git a/changelog.xml b/changelog.xml
deleted file mode 100644
index 763cb8b..0000000
--- a/changelog.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-
-
- Migrated Code from OrientDB 2.2.X APIs OrientDB 3.0.X APIs #16123
- Removed SOAP APIs
- Redesigned HTTP APIs to comply with RESTful architectural style #12997
- Added API to retrieve scheduled tasks #10780
-
-
- Added REST interface to Smart Executor #5109
-
-
- Fixed exception on stop() method #10064
-
-
- Changed TaskUsageRecord use due to changes in model #9646 #9647
-
-
- Setting explictly the context before running the plugin to avoid wrong context made from quartz thread reuse
-
-
- Provided access to UUID and iteration number fro a plugin (refs #6733)
- Added support to implements Reminiscence for a Scheduled Task (refs #772)
- Removed config file support added in release 1.2.0 now available via Reminiscence (refs #772)
- Migrated from CouchDB to OrientDB (refs #6565)
- Added accountign by using TaskUsageRecord (refs #6116)
-
-
- SmartExecutor has been passed to Authorization 2.0 (refs #4944 #2112)
- Provided to plugins the possibility to specify progress percentage (refs #440)
- >Provided to plugins the possibility to define a custom notifier (refs #5089)
-
-
- Using Persistence (CouchDB) to save Scheduled Task configuration (refs #579)
- Added Unscheduling feature for repetitive task (refs #521)
-
-
- Removed Support for Config File to run task at service startup
-
-
- Added Support for Config File to run task at service startup (refs #508)
- Added Recurrent and Scheduled Task support (refs #111)
- Saving Task Evolution on Persistence (CouchDB) (refs #89)
-
-
- First Release
-
-
\ No newline at end of file
diff --git a/gcube-app.xml b/gcube-app.xml
deleted file mode 100644
index 28f89c7..0000000
--- a/gcube-app.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
- ${serviceClass}
- ${name}
- ${version}
- ${description}
-
-
-
diff --git a/gcube/extra-resources/WEB-INF/gcube-app.xml b/gcube/extra-resources/WEB-INF/gcube-app.xml
new file mode 100644
index 0000000..44b06dc
--- /dev/null
+++ b/gcube/extra-resources/WEB-INF/gcube-app.xml
@@ -0,0 +1,8 @@
+
+
+
+ ${project.artifactId}
+ ${serviceClass}
+ ${project.version}
+ ${project.description}
+
\ No newline at end of file