diff --git a/Makefile b/Makefile
index cac92cd1..27925850 100644
--- a/Makefile
+++ b/Makefile
@@ -6,8 +6,9 @@ DNXLIBFP:=$(addprefix $(DNX_USER_HOME)/runtimes/dnx-mono.1.0.0-rc1-update2/bin/,
 CONFIG=Debug
 
 git_status := $(shell git status -s --porcelain |wc -l)
+yavscd=binaries/$(CONFIG)/yavscd
 
-all: yavscd
+all: $(yavscd)
 
 clean: 
 	rm -f src/Yavsc.Abstract/bin/$(CONFIG)/dnx451/Yavsc.Abstract.dll src/OAuth.AspNet.Token/bin/$(CONFIG)/dnx451/OAuth.AspNet.Token.dll src/OAuth.AspNet.AuthServer/bin/$(CONFIG)/dnx451/OAuth.AspNet.AuthServer.dll src/Yavsc.Server/bin/$(CONFIG)/dnx451/Yavsc.Server.dll src/Yavsc/bin/$(CONFIG)/dnx451/Yavsc.dll 
@@ -65,9 +66,10 @@ src/Yavsc.Server/bin/$(CONFIG)/dnx451/Yavsc.Server.dll: src/Yavsc.Abstract/bin/$
 src/Yavsc/bin/$(CONFIG)/dnx451/Yavsc.dll: src/Yavsc.Server/bin/$(CONFIG)/dnx451/Yavsc.Server.dll src/Yavsc.Abstract/bin/$(CONFIG)/dnx451/Yavsc.Abstract.dll src/OAuth.AspNet.AuthServer/bin/$(CONFIG)/dnx451/OAuth.AspNet.AuthServer.dll src/OAuth.AspNet.Token/bin/$(CONFIG)/dnx451/OAuth.AspNet.Token.dll
 	make -C  src/Yavsc CONFIGURATION=$(CONFIG)
 
-yavscd: src/Yavsc/bin/$(CONFIG)/dnx451/Yavsc.dll src/Yavsc.Server/bin/$(CONFIG)/dnx451/Yavsc.Server.dll src/Yavsc.Abstract/bin/$(CONFIG)/dnx451/Yavsc.Abstract.dll src/OAuth.AspNet.AuthServer/bin/$(CONFIG)/dnx451/OAuth.AspNet.AuthServer.dll src/OAuth.AspNet.Token/bin/$(CONFIG)/dnx451/OAuth.AspNet.Token.dll
-	mkbundle --static $(DNXLIBS) src/Yavsc/bin/$(CONFIG)/dnx451/Yavsc.dll src/Yavsc/bin/$(CONFIG)/dnx451/pt/Yavsc.resources.dll src/Yavsc/bin/$(CONFIG)/dnx451/en/Yavsc.resources.dll src/Yavsc.Server/bin/$(CONFIG)/dnx451/Yavsc.Server.dll src/Yavsc.Server/bin/$(CONFIG)/dnx451/en/Yavsc.Server.resources.dll src/Yavsc.Abstract/bin/$(CONFIG)/dnx451/Yavsc.Abstract.dll src/Yavsc.Abstract/bin/$(CONFIG)/dnx451/en/Yavsc.Abstract.resources.dll src/Yavsc.Abstract/bin/$(CONFIG)/dnx451/pt/Yavsc.Abstract.resources.dll src/OAuth.AspNet.AuthServer/bin/$(CONFIG)/dnx451/OAuth.AspNet.AuthServer.dll src/OAuth.AspNet.Token/bin/$(CONFIG)/dnx451/OAuth.AspNet.Token.dll  $(LIBS) -L $(DNX_USER_HOME)/runtimes/dnx-mono.1.0.0-rc1-update2/bin --machine-config $(MONO_PREFIX)/etc/mono/4.5/machine.config -o yavscd
-	strip yavscd
+$(yavscd): src/Yavsc/bin/$(CONFIG)/dnx451/Yavsc.dll src/Yavsc.Server/bin/$(CONFIG)/dnx451/Yavsc.Server.dll src/Yavsc.Abstract/bin/$(CONFIG)/dnx451/Yavsc.Abstract.dll src/OAuth.AspNet.AuthServer/bin/$(CONFIG)/dnx451/OAuth.AspNet.AuthServer.dll src/OAuth.AspNet.Token/bin/$(CONFIG)/dnx451/OAuth.AspNet.Token.dll
+	mkdir -p binaries/$(CONFIG)
+	mkbundle --static $(DNXLIBS) src/Yavsc/bin/$(CONFIG)/dnx451/Yavsc.dll src/Yavsc/bin/$(CONFIG)/dnx451/pt/Yavsc.resources.dll src/Yavsc/bin/$(CONFIG)/dnx451/en/Yavsc.resources.dll src/Yavsc.Server/bin/$(CONFIG)/dnx451/Yavsc.Server.dll src/Yavsc.Server/bin/$(CONFIG)/dnx451/en/Yavsc.Server.resources.dll src/Yavsc.Abstract/bin/$(CONFIG)/dnx451/Yavsc.Abstract.dll src/Yavsc.Abstract/bin/$(CONFIG)/dnx451/en/Yavsc.Abstract.resources.dll src/Yavsc.Abstract/bin/$(CONFIG)/dnx451/pt/Yavsc.Abstract.resources.dll src/OAuth.AspNet.AuthServer/bin/$(CONFIG)/dnx451/OAuth.AspNet.AuthServer.dll src/OAuth.AspNet.Token/bin/$(CONFIG)/dnx451/OAuth.AspNet.Token.dll  $(LIBS) -L $(DNX_USER_HOME)/runtimes/dnx-mono.1.0.0-rc1-update2/bin --machine-config $(MONO_PREFIX)/etc/mono/4.5/machine.config -o $(yavscd)
+	strip $(yavscd)
 
 version-increment-patch:
 	scripts/version.sh $$(cat version.txt) patch > version.txt
diff --git a/scripts/make/dnx.mk b/scripts/make/dnx.mk
index e4a0e3a7..aae05d7c 100644
--- a/scripts/make/dnx.mk
+++ b/scripts/make/dnx.mk
@@ -15,7 +15,6 @@ BINTARGET=$(PRJNAME).dll
 BINTARGETPATH=bin/$(CONFIGURATION)/$(FRAMEWORKALIAS)/$(BINTARGET)
 PKGFILENAME=$(PRJNAME).$(VERSION).nupkg
 dnu=dnu
-dnx=ndnx
 
 # OBS SUBDIRS=Yavsc.Server Yavsc.Abstract Yavsc cli
 #
@@ -27,6 +26,9 @@ git_status := $(shell git status -s --porcelain |wc -l)
 
 all: $(BINTARGETPATH)
 
+fixSystemXML:
+	@# fixing package id reference case, to System.Xml, from package NJsonSchema.CodeGeneration.CSharp
+	@sed 's/System.XML/System.Xml/' project.lock.json > project.lock.json.new && mv project.lock.json.new project.lock.json
 
 restore:
 	touch project.json
diff --git a/scripts/make/versioning.mk b/scripts/make/versioning.mk
index f721a1c3..48ca3c05 100644
--- a/scripts/make/versioning.mk
+++ b/scripts/make/versioning.mk
@@ -15,5 +15,3 @@ ifndef version
 else
 	@echo 'Got version number : $(version)'
 endif
-
-
diff --git a/src/cli/Makefile b/src/cli/Makefile
index 3cb31848..a36ef5b3 100644
--- a/src/cli/Makefile
+++ b/src/cli/Makefile
@@ -1,29 +1,27 @@
 SOURCE_DIR=$(HOME)/workspace/yavsc
-MAKEFILE_DIR=$(SOURCE_DIR)/scripts/build/make
-include $(MAKEFILE_DIR)/versioning.mk
-include $(MAKEFILE_DIR)/dnx.mk
-
+MAKEFILE_DIR=$(SOURCE_DIR)/scripts/make
 MSBUILD=msbuild
 
 all: $(BINTARGETPATH)
 
-msbuild-restore:
-	$(MSBUILD) cli.csproj /t:Restore
+include $(MAKEFILE_DIR)/dnx.mk
 
-check: run
+# makes version
+include $(MAKEFILE_DIR)/versioning.mk
 
-fixSystemXML:
-	@# fixing package id reference case, to System.Xml, from package NJsonSchema.CodeGeneration.CSharp
-	@sed 's/System.XML/System.Xml/' project.lock.json > project.lock.json.new && mv project.lock.json.new project.lock.json
+msbuild-restore:
+	$(MSBUILD) $(PRJNAME).csproj /t:Restore
 
+check: run
 
-$(BINTARGETPATH): project.lock.json
+: project.lock.json
+	@dnu build --configuration=$(CONFIGURATION) 
 
 run: $(BINTARGETPATH)
 	ASPNET_ENV=$(ASPNET_ENV) dnx --configuration=$(CONFIGURATION) run send monthly
 
 info:
-	@echo $(PRJNAME)
+	@echo $(PRJNAME) : $(BINTARGETPATH) $(version)
 
 # Due to NJsonSchema.CodeGeneration.CSharp package:
-.PHONY: project.lock.json
+.PHONY: $(BINTARGETPATH)
diff --git a/src/cli/project.json b/src/cli/project.json
index d3660ef3..b01c462f 100644
--- a/src/cli/project.json
+++ b/src/cli/project.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.5-*",
+  "version": "1.0.6-*",
   "commands": {
     "run": "run"
   },