diff --git a/bfxapi/examples/candel_order.py b/bfxapi/examples/ws/candel_order.py
similarity index 95%
rename from bfxapi/examples/candel_order.py
rename to bfxapi/examples/ws/candel_order.py
index 6571e25..b13b3af 100644
--- a/bfxapi/examples/candel_order.py
+++ b/bfxapi/examples/ws/candel_order.py
@@ -1,38 +1,38 @@
-import os
-import sys
-sys.path.append('../')
-
-from bfxapi import Client
-
-API_KEY=os.getenv("BFX_KEY")
-API_SECRET=os.getenv("BFX_SECRET")
-
-bfx = Client(
-  API_KEY=API_KEY,
-  API_SECRET=API_SECRET,
-  logLevel='INFO'
-)
-
-@bfx.ws.on('order_closed')
-def order_cancelled(order, trade):
-  print ("Order cancelled.")
-  print (order)
-  print (trade)
-
-@bfx.ws.on('order_confirmed')
-async def trade_completed(order, trade):
-  print ("Order confirmed.")
-  print (order)
-  print (trade)
-  await bfx.ws.cancel_order(order.id)
-
-@bfx.ws.on('error')
-def log_error(msg):
-  print ("Error: {}".format(msg))
-
-@bfx.ws.once('authenticated')
-async def submit_order(auth_message):
-  # create an inital order a really low price so it stays open
-  await bfx.ws.submit_order('tBTCUSD', 10, 1, 'EXCHANGE LIMIT')
-
-bfx.ws.run()
+import os
+import sys
+sys.path.append('../')
+
+from bfxapi import Client
+
+API_KEY=os.getenv("BFX_KEY")
+API_SECRET=os.getenv("BFX_SECRET")
+
+bfx = Client(
+  API_KEY=API_KEY,
+  API_SECRET=API_SECRET,
+  logLevel='INFO'
+)
+
+@bfx.ws.on('order_closed')
+def order_cancelled(order, trade):
+  print ("Order cancelled.")
+  print (order)
+  print (trade)
+
+@bfx.ws.on('order_confirmed')
+async def trade_completed(order, trade):
+  print ("Order confirmed.")
+  print (order)
+  print (trade)
+  await bfx.ws.cancel_order(order.id)
+
+@bfx.ws.on('error')
+def log_error(msg):
+  print ("Error: {}".format(msg))
+
+@bfx.ws.once('authenticated')
+async def submit_order(auth_message):
+  # create an inital order a really low price so it stays open
+  await bfx.ws.submit_order('tBTCUSD', 10, 1, 'EXCHANGE LIMIT')
+
+bfx.ws.run()
diff --git a/bfxapi/examples/connect.py b/bfxapi/examples/ws/connect.py
similarity index 93%
rename from bfxapi/examples/connect.py
rename to bfxapi/examples/ws/connect.py
index c37de49..87d35c5 100644
--- a/bfxapi/examples/connect.py
+++ b/bfxapi/examples/ws/connect.py
@@ -1,19 +1,19 @@
-import os
-import sys
-sys.path.append('../')
-
-from bfxapi import Client
-
-bfx = Client(
-  logLevel='DEBUG'
-)
-
-@bfx.ws.on('error')
-def log_error(msg):
-  print ("Error: {}".format(msg))
-
-@bfx.ws.on('all')
-async def log_output(output):
-  print ("WS: {}".format(output))
-
-bfx.ws.run()
+import os
+import sys
+sys.path.append('../')
+
+from bfxapi import Client
+
+bfx = Client(
+  logLevel='DEBUG'
+)
+
+@bfx.ws.on('error')
+def log_error(msg):
+  print ("Error: {}".format(msg))
+
+@bfx.ws.on('all')
+async def log_output(output):
+  print ("WS: {}".format(output))
+
+bfx.ws.run()
diff --git a/bfxapi/examples/get_seed_trades.py b/bfxapi/examples/ws/get_seed_trades.py
similarity index 100%
rename from bfxapi/examples/get_seed_trades.py
rename to bfxapi/examples/ws/get_seed_trades.py
diff --git a/bfxapi/examples/resubscribe_orderbook.py b/bfxapi/examples/ws/resubscribe_orderbook.py
similarity index 100%
rename from bfxapi/examples/resubscribe_orderbook.py
rename to bfxapi/examples/ws/resubscribe_orderbook.py
diff --git a/bfxapi/examples/send_order.py b/bfxapi/examples/ws/send_order.py
similarity index 95%
rename from bfxapi/examples/send_order.py
rename to bfxapi/examples/ws/send_order.py
index a02d607..2a2bb5a 100644
--- a/bfxapi/examples/send_order.py
+++ b/bfxapi/examples/ws/send_order.py
@@ -1,48 +1,48 @@
-import os
-import sys
-sys.path.append('../')
-
-from bfxapi import Client
-
-API_KEY=os.getenv("BFX_KEY")
-API_SECRET=os.getenv("BFX_SECRET")
-
-bfx = Client(
-  API_KEY=API_KEY,
-  API_SECRET=API_SECRET,
-  logLevel='DEBUG'
-)
-
-@bfx.ws.on('order_snapshot')
-async def close_all(data):
-  await bfx.ws.close_all_orders()
-
-@bfx.ws.on('order_confirmed')
-async def trade_completed(order, trade):
-  print ("Order confirmed.")
-  print (order)
-  print (trade)
-  ## close the order
-  # await order.close()
-  # or
-  # await bfx.ws.close_order(order.id)
-  # or
-  # await bfx.ws.close_all_orders()
-
-@bfx.ws.on('error')
-def log_error(msg):
-  print ("Error: {}".format(msg))
-
-@bfx.ws.on('authenticated')
-async def submit_order(auth_message):
-  await bfx.ws.submit_order('tBTCUSD', 19000, 0.01, 'EXCHANGE LIMIT')
-
-# If you dont want to use a decorator
-# ws.on('authenticated', submit_order)
-# ws.on('error', log_error)
-
-# You can also provide a callback
-# await ws.submit_order('tBTCUSD', 0, 0.01,
-# 'EXCHANGE MARKET', onComplete=trade_complete)
-
-bfx.ws.run()
+import os
+import sys
+sys.path.append('../')
+
+from bfxapi import Client
+
+API_KEY=os.getenv("BFX_KEY")
+API_SECRET=os.getenv("BFX_SECRET")
+
+bfx = Client(
+  API_KEY=API_KEY,
+  API_SECRET=API_SECRET,
+  logLevel='DEBUG'
+)
+
+@bfx.ws.on('order_snapshot')
+async def close_all(data):
+  await bfx.ws.close_all_orders()
+
+@bfx.ws.on('order_confirmed')
+async def trade_completed(order, trade):
+  print ("Order confirmed.")
+  print (order)
+  print (trade)
+  ## close the order
+  # await order.close()
+  # or
+  # await bfx.ws.close_order(order.id)
+  # or
+  # await bfx.ws.close_all_orders()
+
+@bfx.ws.on('error')
+def log_error(msg):
+  print ("Error: {}".format(msg))
+
+@bfx.ws.on('authenticated')
+async def submit_order(auth_message):
+  await bfx.ws.submit_order('tBTCUSD', 19000, 0.01, 'EXCHANGE LIMIT')
+
+# If you dont want to use a decorator
+# ws.on('authenticated', submit_order)
+# ws.on('error', log_error)
+
+# You can also provide a callback
+# await ws.submit_order('tBTCUSD', 0, 0.01,
+# 'EXCHANGE MARKET', onComplete=trade_complete)
+
+bfx.ws.run()
diff --git a/bfxapi/examples/subscribe_orderbook.py b/bfxapi/examples/ws/subscribe_orderbook.py
similarity index 100%
rename from bfxapi/examples/subscribe_orderbook.py
rename to bfxapi/examples/ws/subscribe_orderbook.py
diff --git a/bfxapi/examples/subscribe_trades_candles.py b/bfxapi/examples/ws/subscribe_trades_candles.py
similarity index 95%
rename from bfxapi/examples/subscribe_trades_candles.py
rename to bfxapi/examples/ws/subscribe_trades_candles.py
index 1b1dd27..27530ed 100644
--- a/bfxapi/examples/subscribe_trades_candles.py
+++ b/bfxapi/examples/ws/subscribe_trades_candles.py
@@ -1,28 +1,28 @@
-import os
-import sys
-sys.path.append('../')
-
-from bfxapi import Client
-
-bfx = Client(
-  logLevel='DEBUG'
-)
-
-@bfx.ws.on('error')
-def log_error(err):
-  print ("Error: {}".format(err))
-
-@bfx.ws.on('new_candle')
-def log_candle(candle):
-  print ("New candle: {}".format(candle))
-
-@bfx.ws.on('new_trade')
-def log_trade(trade):
-  print ("New trade: {}".format(trade))
-
-async def start():
-  await bfx.ws.subscribe('candles', 'tBTCUSD', timeframe='1m')
-  await bfx.ws.subscribe('trades', 'tBTCUSD')
-
-bfx.ws.on('connected', start)
-bfx.ws.run()
+import os
+import sys
+sys.path.append('../')
+
+from bfxapi import Client
+
+bfx = Client(
+  logLevel='DEBUG'
+)
+
+@bfx.ws.on('error')
+def log_error(err):
+  print ("Error: {}".format(err))
+
+@bfx.ws.on('new_candle')
+def log_candle(candle):
+  print ("New candle: {}".format(candle))
+
+@bfx.ws.on('new_trade')
+def log_trade(trade):
+  print ("New trade: {}".format(trade))
+
+async def start():
+  await bfx.ws.subscribe('candles', 'tBTCUSD', timeframe='1m')
+  await bfx.ws.subscribe('trades', 'tBTCUSD')
+
+bfx.ws.on('connected', start)
+bfx.ws.run()
diff --git a/bfxapi/examples/update_order.py b/bfxapi/examples/ws/update_order.py
similarity index 95%
rename from bfxapi/examples/update_order.py
rename to bfxapi/examples/ws/update_order.py
index 2fe4f2a..d2cff40 100644
--- a/bfxapi/examples/update_order.py
+++ b/bfxapi/examples/ws/update_order.py
@@ -1,43 +1,43 @@
-import os
-import sys
-sys.path.append('../')
-
-from bfxapi import Client
-
-API_KEY=os.getenv("BFX_KEY")
-API_SECRET=os.getenv("BFX_SECRET")
-
-bfx = Client(
-  API_KEY=API_KEY,
-  API_SECRET=API_SECRET,
-  logLevel='DEBUG'
-)
-
-@bfx.ws.on('order_update')
-def order_updated(order, trade):
-  print ("Order updated.")
-  print (order)
-  print (trade)
-
-@bfx.ws.once('order_update')
-async def order_once_updated(order, trade):
-  # update a second time using the object function
-  await order.update(price=80, amount=0.02, flags="2nd update")
-
-@bfx.ws.once('order_confirmed')
-async def trade_completed(order, trade):
-  print ("Order confirmed.")
-  print (order)
-  print (trade)
-  await bfx.ws.update_order(order.id, price=100, amount=0.01)
-
-@bfx.ws.on('error')
-def log_error(msg):
-  print ("Error: {}".format(msg))
-
-@bfx.ws.once('authenticated')
-async def submit_order(auth_message):
-  # create an inital order a really low price so it stays open
-  await bfx.ws.submit_order('tBTCUSD', 10, 1, 'EXCHANGE LIMIT')
-
-bfx.ws.run()
+import os
+import sys
+sys.path.append('../')
+
+from bfxapi import Client
+
+API_KEY=os.getenv("BFX_KEY")
+API_SECRET=os.getenv("BFX_SECRET")
+
+bfx = Client(
+  API_KEY=API_KEY,
+  API_SECRET=API_SECRET,
+  logLevel='DEBUG'
+)
+
+@bfx.ws.on('order_update')
+def order_updated(order, trade):
+  print ("Order updated.")
+  print (order)
+  print (trade)
+
+@bfx.ws.once('order_update')
+async def order_once_updated(order, trade):
+  # update a second time using the object function
+  await order.update(price=80, amount=0.02, flags="2nd update")
+
+@bfx.ws.once('order_confirmed')
+async def trade_completed(order, trade):
+  print ("Order confirmed.")
+  print (order)
+  print (trade)
+  await bfx.ws.update_order(order.id, price=100, amount=0.01)
+
+@bfx.ws.on('error')
+def log_error(msg):
+  print ("Error: {}".format(msg))
+
+@bfx.ws.once('authenticated')
+async def submit_order(auth_message):
+  # create an inital order a really low price so it stays open
+  await bfx.ws.submit_order('tBTCUSD', 10, 1, 'EXCHANGE LIMIT')
+
+bfx.ws.run()
diff --git a/bfxapi/examples/wallet_balance.py b/bfxapi/examples/ws/wallet_balance.py
similarity index 94%
rename from bfxapi/examples/wallet_balance.py
rename to bfxapi/examples/ws/wallet_balance.py
index 0d9ab35..7df0e0b 100644
--- a/bfxapi/examples/wallet_balance.py
+++ b/bfxapi/examples/ws/wallet_balance.py
@@ -1,31 +1,31 @@
-import os
-import sys
-sys.path.append('../')
-
-from bfxapi import Client
-
-API_KEY=os.getenv("BFX_KEY")
-API_SECRET=os.getenv("BFX_SECRET")
-
-bfx = Client(
-  API_KEY=API_KEY,
-  API_SECRET=API_SECRET,
-  logLevel='INFO'
-)
-
-@bfx.ws.on('wallet_snapshot')
-def log_snapshot(wallets):
-  for wallet in wallets:
-    print (wallet)
-  
-  # or bfx.ws.wallets.get_wallets()
-
-@bfx.ws.on('wallet_update')
-def log_update(wallet):
-  print ("Balance updates: {}".format(wallet))
-
-@bfx.ws.on('error')
-def log_error(msg):
-  print ("Error: {}".format(msg))
-
-bfx.ws.run()
+import os
+import sys
+sys.path.append('../')
+
+from bfxapi import Client
+
+API_KEY=os.getenv("BFX_KEY")
+API_SECRET=os.getenv("BFX_SECRET")
+
+bfx = Client(
+  API_KEY=API_KEY,
+  API_SECRET=API_SECRET,
+  logLevel='INFO'
+)
+
+@bfx.ws.on('wallet_snapshot')
+def log_snapshot(wallets):
+  for wallet in wallets:
+    print (wallet)
+  
+  # or bfx.ws.wallets.get_wallets()
+
+@bfx.ws.on('wallet_update')
+def log_update(wallet):
+  print ("Balance updates: {}".format(wallet))
+
+@bfx.ws.on('error')
+def log_error(msg):
+  print ("Error: {}".format(msg))
+
+bfx.ws.run()