diff --git a/deploy-cluster-aws/bigchain/bigchaindb.conf b/deploy-cluster-aws/conf/bigchaindb.conf
similarity index 100%
rename from deploy-cluster-aws/bigchain/bigchaindb.conf
rename to deploy-cluster-aws/conf/bigchaindb.conf
diff --git a/deploy-cluster-aws/bigchain/bigchaindb.conf.template b/deploy-cluster-aws/conf/bigchaindb.conf.template
similarity index 100%
rename from deploy-cluster-aws/bigchain/bigchaindb.conf.template
rename to deploy-cluster-aws/conf/bigchaindb.conf.template
diff --git a/deploy-cluster-aws/fabfile.py b/deploy-cluster-aws/fabfile.py
index 47eb0a81..7af04d32 100644
--- a/deploy-cluster-aws/fabfile.py
+++ b/deploy-cluster-aws/fabfile.py
@@ -87,7 +87,7 @@ def install_rethinkdb():
         # change fs to user
         sudo('chown -R rethinkdb:rethinkdb /data')
         # copy config file to target system
-        put('bigchain/bigchaindb.conf',
+        put('conf/bigchaindb.conf',
             '/etc/rethinkdb/instances.d/instance1.conf', mode=0600, use_sudo=True)
         # initialize data-dir
         sudo('rm -rf /data/*')
diff --git a/deploy-cluster-aws/startup.sh b/deploy-cluster-aws/startup.sh
index 2f946e01..7feae98d 100755
--- a/deploy-cluster-aws/startup.sh
+++ b/deploy-cluster-aws/startup.sh
@@ -73,8 +73,8 @@ chmod +x add2known_hosts.sh
 ./add2known_hosts.sh
 
 # resetting the rethinkdb initfile and adding the nodes to join...
-cp bigchain/bigchaindb.conf.template bigchain/bigchaindb.conf
-cat add2dbconf >> bigchain/bigchaindb.conf
+cp conf/bigchaindb.conf.template conf/bigchaindb.conf
+cat add2dbconf >> conf/bigchaindb.conf
 
 # rollout base packages for installation of storage and bigchain
 fab install_base_software
@@ -86,7 +86,7 @@ fab install_rethinkdb
 fab install_bigchain
 
 # generate genesisblock
-HORST=`tail -1 bigchain/bigchaindb.conf|cut -d: -f1|cut -d= -f2`
+HORST=`tail -1 conf/bigchaindb.conf|cut -d: -f1|cut -d= -f2`
 fab -H $HORST -f fab_prepare_chain.py init_bigchaindb
 # initiate sharding
 fab start_bigchain_nodes