diff --git a/.gitignore b/.gitignore
index 6472d1051b..a4ed5adb49 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@
.pydevproject
.recommenders
.settings
+.fbExcludeFilterFile
target
target-ide
*.iml
@@ -23,7 +24,7 @@ maven-metadata-local.xml
*.md.html
dependencies
code*/dist*
-
+dist/
code/ux/ux-dev.sh
core/store/trivial/data/
core/store/apps
@@ -33,3 +34,4 @@ yang-gen-sal/
yang-gen-config/
models/tools/src/main/odl-yang-to-sources/src/main/yang/core-model@2017-12-29.yang
wireless-transport/
+yarn-error.log
diff --git a/bin/odl.sh b/bin/odl.sh
index f25428cf4e..fe9b6f984e 100755
--- a/bin/odl.sh
+++ b/bin/odl.sh
@@ -30,7 +30,7 @@
Version=2.24
# ----- Constants not depending on variables specified by $CONFIG
-ODLPARENT="0.5.1-SNAPSHOT"
+ODLPARENT="0.7.3-SNAPSHOT"
STARTFEATURE="odl-dev-all"
KARAFSLEEPFORSTART=30
ODLBIN=../bin
diff --git a/code-Oxygen-SR3/apps/odlux-core/LICENSE b/code-Oxygen-SR3/apps/odlux-core/LICENSE
new file mode 100644
index 0000000000..3556ffa71f
--- /dev/null
+++ b/code-Oxygen-SR3/apps/odlux-core/LICENSE
@@ -0,0 +1,13 @@
+/*
+ * ============LICENSE_START=============================================================================================================
+ * Copyright (c) 2018 highstreet-technolgies.
+ * ===================================================================
+ * 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.
+ * ============LICENSE_END===============================================================================================================
+ *
+ */
\ No newline at end of file
diff --git a/code-Oxygen-SR3/apps/odlux-core/features/.gitignore b/code-Oxygen-SR3/apps/odlux-core/features/.gitignore
new file mode 100644
index 0000000000..eacf31a678
--- /dev/null
+++ b/code-Oxygen-SR3/apps/odlux-core/features/.gitignore
@@ -0,0 +1 @@
+/target-ide/
diff --git a/code-Oxygen-SR3/apps/odlux-core/features/pom.xml b/code-Oxygen-SR3/apps/odlux-core/features/pom.xml
new file mode 100644
index 0000000000..2c01f2ef45
--- /dev/null
+++ b/code-Oxygen-SR3/apps/odlux-core/features/pom.xml
@@ -0,0 +1,73 @@
+