diff --git a/.nuxr-app-root b/.nuxr-app-root
new file mode 100644
index 0000000..e69de29
diff --git a/bash_aliases b/bash_aliases
index bdef0c6..32cb00d 100755
--- a/bash_aliases
+++ b/bash_aliases
@@ -9,7 +9,9 @@ alias m2-clean-snapshots="find ~/.m2/repository/ -name \"*-SNAPSHOT\" -type d |
 # GIT and GITK Aliases
 alias gitk-all="(git branch -l) | sed "s/^*//" | xargs gitk"
 
+alias by="mark this"
 alias fav="mark multiple fav"
 alias mark-this="mark this"
+
 # alias analyse-java-name-conflict="find -iname *.java | grep -v package-info.java | grep -v yang-gen | grep -v target | sed "s/[\\.a-z0-9\\/\\-]*\\/\([\\\$a-zA-Z0-9]*\)\.java/\1/g" | sort | uniq -c | grep -v " 1 ""
 # alias analyse-java-annotation=find -iname "*.java" | xargs grep "@$1" | sed "s/@$1\\(.*\\)/\\1/g"
diff --git a/bin/nudsl b/bin/nudsl
index 1941b7d..86678b3 100755
--- a/bin/nudsl
+++ b/bin/nudsl
@@ -1,11 +1,11 @@
 #!/usr/bin/env nux-runner
 
-nux.use nudsl
+#nux.use nudsl
 
 ## highlight:: <language> <file>
 
 task.highlight() {
-  nux.use nux/nuxsh
+
   nux.dsl.process highlight nux.nuxsh.language.def "$2"
 }
 
@@ -23,7 +23,6 @@ task.plan.compile() {
 }
 
 task.plan.preview() {
-  nux.use nux/nuxsh
   nux.dsl.plan nux.nuxsh.language "$2"
   plan="$(nudsl.plan.file "$1" "$2")"
   if [ -e "$plan" ]; then
diff --git a/bin/taskie b/bin/taskie
index 1dfdadd..1051463 100755
--- a/bin/taskie
+++ b/bin/taskie
@@ -4,8 +4,8 @@
 
 #source ~/.config/nux-env/taskie
 
-nux.use nuxfs
-nux.use nux.repl
+nux.use nux/fs
+nux.use nux/repl
 
 nux.use taskie/common
 nux.use taskie/backend.github
diff --git a/inc/nux.repl.inc.sh b/inc/nux/repl.nuxsh.sh
similarity index 93%
rename from inc/nux.repl.inc.sh
rename to inc/nux/repl.nuxsh.sh
index 3974931..e60f3fb 100644
--- a/inc/nux.repl.inc.sh
+++ b/inc/nux/repl.nuxsh.sh
@@ -1,16 +1,11 @@
 
+@namespace nux.repl. {
 
 ## nux.repl.start <processor> [<prompt>] [<complete>]
 ##   Starts NUX REPL
 ##
 ##   FIXME: Add autocompletion
-function nux.repl.start {
-  function .null() {
-    :
-  }
-  local processor=$1;
-  local prompt=${2:-.null};
-  local complete=$3;
+function :start processor prompt complete {
   local command=""
 
   if nux.check.function $complete; then
@@ -40,10 +35,7 @@ function nux.repl.start {
 ## This function is modified version of
 ## https://github.com/mchav/with/blob/master/with
 
-function nux.repl.completion() {
-  local prompt=$1;
-  local compgen_command=$2;
-  shift;shift;
+function :completion prompt compgen_command {
   # print readline's prompt for visual separation
   if [ "$#" -eq 0 ]; then
       echo "$($prompt)$READLINE_LINE"
@@ -118,3 +110,5 @@ function nux.repl.completion() {
     for completion in "${COMPREPLY[@]}"; do echo "$completion"; done | column
   fi
 }
+
+}
diff --git a/inc/nuxr.nuxsh.sh b/inc/nuxr.nuxsh.sh
index 34cbd2c..16ca164 100644
--- a/inc/nuxr.nuxsh.sh
+++ b/inc/nuxr.nuxsh.sh
@@ -41,7 +41,7 @@ nux.use nuxr/repl
 ###   Runs an interactive taskie shell with base taskie commands available.
 ###
   function :interactive() {
-    nux.use nux.repl
+    nux.use nux/repl
     nux.repl.start nuxr.repl.process nuxr.repl.prompt nuxr.repl.completer
   }
 
diff --git a/inc/taskie/backend.dir.inc.sh b/inc/taskie/backend.dir.inc.sh
index 8d1c91e..ad1b56d 100644
--- a/inc/taskie/backend.dir.inc.sh
+++ b/inc/taskie/backend.dir.inc.sh
@@ -1,8 +1,9 @@
+nux.use nux/fs
 nux.log debug "Backend Dir loaded"
 
 backend.dir.detect() {
-  local dottaskie=$(nuxfs.closest .taskie "$1")
-  local dottaskiedir=$(nuxfs.closest .taskie.self "$1")
+  local dottaskie=$(nux.fs.closest .taskie "$1")
+  local dottaskiedir=$(nux.fs.closest .taskie.self "$1")
   if [ -d "$dottaskie" ]; then
     echo "$dottaskie"
   elif [ -f "$dottaskie" -a "$(yaml r "$dottaskie" backend)" = "dir:self" ]; then
diff --git a/inc/taskie/backend.github.inc.sh b/inc/taskie/backend.github.inc.sh
index 4cd5c38..a6de8c9 100644
--- a/inc/taskie/backend.github.inc.sh
+++ b/inc/taskie/backend.github.inc.sh
@@ -22,7 +22,7 @@ backend.github.with() {
 }
 
 backend.github.detect() {
-  closest_git=$(nuxfs.closest .git "$1")
+  closest_git=$(nux.fs.closest .git "$1")
 
   git.origins "$closest_git" | grep github.com | while read origin
   do
diff --git a/inc/taskie/backend.gogs.inc.sh b/inc/taskie/backend.gogs.inc.sh
index e68bb3b..0fc4295 100644
--- a/inc/taskie/backend.gogs.inc.sh
+++ b/inc/taskie/backend.gogs.inc.sh
@@ -5,7 +5,7 @@ nux.use nux.json
 githublike gogs
 
 backend.gogs.detect() {
-  closest_git=$(nuxfs.closest .git "$1")
+  closest_git=$(nux.fs.closest .git "$1")
   git.origins "$closest_git" | while read origin
   do
     nux.log debug Testing backend for: $origin