diff --git a/CTFs_and_WarGames/2014/9447/nosql/capture.pcap b/CTFs_and_WarGames/2014/9447/nosql/capture.pcap
new file mode 100755
index 0000000..3b8bb50
Binary files /dev/null and b/CTFs_and_WarGames/2014/9447/nosql/capture.pcap differ
diff --git a/CTFs_and_WarGames/2014/9447/nosql/client.py b/CTFs_and_WarGames/2014/9447/nosql/client.py
new file mode 100755
index 0000000..a837e01
--- /dev/null
+++ b/CTFs_and_WarGames/2014/9447/nosql/client.py
@@ -0,0 +1,50 @@
+#!/usr/bin/python2
+
+import os, socket, struct, sys
+from Crypto.Cipher import AES
+
+
+class EncryptedStream(object):
+  key = 'this is not the flag nor the key'[:16]
+
+  def __init__(self, host, port):
+    self.sock = socket.socket()
+    self.sock.connect((host, port))
+
+  def send(self, msg):
+    while len(msg) % 16:
+      msg += '\0'
+
+    iv = os.urandom(16)
+    aes = AES.new(self.key, AES.MODE_ECB, iv)
+    enc = aes.encrypt(msg)
+
+    self.sock.send(struct.pack('<I', len(enc)))
+    self.sock.send(enc)
+
+  def recv(self, nbytes):
+    return self.sock.recv(nbytes)
+
+
+
+
+client = '''\
+HELLO
+SHOW VERSION
+SET example This tiny script is basically a RedisStore...
+GET example
+SHOW KEYS
+SET brucefact#1 Bruce Schneier can break elliptic curve cryptography by bending it into a circle
+SET brucefact#2 Bruce Schneier always cooks his eggs scrambled. When he wants hardboiled eggs, he unscrambles them
+SET brucefact#3 Bruce Schneier could solve this by inverting md5 hash of the flag
+ENCRYPTION HEX
+MD5 flag
+'''
+
+stream = EncryptedStream(sys.argv[1], int(sys.argv[2]))
+stream.send(client)
+
+while 1:
+  data = stream.recv(1000)
+  if not data: break
+  sys.stdout.write(data)
diff --git a/CTFs_and_WarGames/2014/9447/nosql/server.py b/CTFs_and_WarGames/2014/9447/nosql/server.py
new file mode 100755
index 0000000..f823cc0
--- /dev/null
+++ b/CTFs_and_WarGames/2014/9447/nosql/server.py
@@ -0,0 +1,90 @@
+#!/usr/bin/python2
+
+import hashlib, os, signal, struct, sys
+from Crypto.Cipher import AES
+
+
+key = 'this is not the flag nor the key'[:16]
+db = { }
+
+
+def md5(data):
+  return hashlib.md5(data).digest()
+
+
+def decrypt(data):
+  iv = os.urandom(16)
+  aes = AES.new(key, AES.MODE_ECB, iv)
+  data = aes.decrypt(data)
+  return data.rstrip('\0')
+
+
+def reply_plain(message):
+  sys.stdout.write(message + '\n')
+
+
+def reply_hex(message):
+  # This is totally encrypted, right?
+  sys.stdout.write(message.encode('hex') + '\n')
+
+
+def main():
+  global db
+  reply = reply_plain
+
+  datalen = struct.unpack('<I', sys.stdin.read(4))[0]
+  data = ''
+  while len(data) != datalen:
+    s = sys.stdin.read(1)
+    if not s:
+      sys.exit(1)
+    data += s
+  data = decrypt(data)
+
+
+  commands = data.split('\n')
+
+  for cmd in commands:
+    if not cmd:
+      continue
+    if ' ' in cmd:
+      cmd, args = cmd.split(' ', 1)
+
+    if cmd == 'HELLO':
+      reply('WELCOME')
+    elif cmd == 'SHOW':
+      if args == 'VERSION':
+        reply('NoRedisSQL v1.0')
+      elif args == 'KEYS':
+        reply(repr(db.keys()))
+      elif args == 'ME THE MONEY':
+        reply("Jerry, doesn't it make you feel good just to say that!")
+      else:
+        reply('u w0t m8')
+    elif cmd == 'SET':
+      key, value = args.split(' ', 1)
+      db[key] = value
+      reply('OK')
+    elif cmd == 'GET':
+      reply(args + ': ' + db.get(args, ''))
+    elif cmd == 'SNIPPET':
+      reply(db[args][:10] + '...')
+    elif cmd == 'MD5':
+      reply(md5(db.get(args, '')))
+    elif cmd == 'ENCRYPTION':
+      if args == 'HEX':
+        reply = reply_hex
+        reply('OK')
+      elif args == 'OFF':
+        reply = reply_plain
+        reply('OK')
+      else:
+        reply('u w0t m8')
+    else:
+      reply('Unknown command %r' % (cmd))
+
+
+if __name__ == '__main__':
+  signal.alarm(10)
+  signal.signal(signal.SIGALRM, lambda a,b: sys.exit(0))
+  main()
diff --git a/CTFs_and_WarGames/2014-ASIS-CTF/crypto_paillier/__init__.py b/CTFs_and_WarGames/2014/ASIS-final/crypto_paillier/__init__.py
similarity index 100%
rename from CTFs_and_WarGames/2014-ASIS-CTF/crypto_paillier/__init__.py
rename to CTFs_and_WarGames/2014/ASIS-final/crypto_paillier/__init__.py
diff --git a/CTFs_and_WarGames/2014-ASIS-CTF/crypto_paillier/answer_pallier.py b/CTFs_and_WarGames/2014/ASIS-final/crypto_paillier/answer_pallier.py
similarity index 100%
rename from CTFs_and_WarGames/2014-ASIS-CTF/crypto_paillier/answer_pallier.py
rename to CTFs_and_WarGames/2014/ASIS-final/crypto_paillier/answer_pallier.py
diff --git a/CTFs_and_WarGames/2014-ASIS-CTF/crypto_paillier/binary_search.py b/CTFs_and_WarGames/2014/ASIS-final/crypto_paillier/binary_search.py
similarity index 100%
rename from CTFs_and_WarGames/2014-ASIS-CTF/crypto_paillier/binary_search.py
rename to CTFs_and_WarGames/2014/ASIS-final/crypto_paillier/binary_search.py
diff --git a/CTFs_and_WarGames/2014-ASIS-CTF/crypto_paillier/constants.py b/CTFs_and_WarGames/2014/ASIS-final/crypto_paillier/constants.py
similarity index 100%
rename from CTFs_and_WarGames/2014-ASIS-CTF/crypto_paillier/constants.py
rename to CTFs_and_WarGames/2014/ASIS-final/crypto_paillier/constants.py
diff --git a/CTFs_and_WarGames/2014-ASIS-CTF/crypto_paillier/nc_paillier.py b/CTFs_and_WarGames/2014/ASIS-final/crypto_paillier/nc_paillier.py
similarity index 100%
rename from CTFs_and_WarGames/2014-ASIS-CTF/crypto_paillier/nc_paillier.py
rename to CTFs_and_WarGames/2014/ASIS-final/crypto_paillier/nc_paillier.py
diff --git a/CTFs_and_WarGames/2014-ASIS-CTF/crypto_paillier/paillier.md b/CTFs_and_WarGames/2014/ASIS-final/crypto_paillier/paillier.md
similarity index 100%
rename from CTFs_and_WarGames/2014-ASIS-CTF/crypto_paillier/paillier.md
rename to CTFs_and_WarGames/2014/ASIS-final/crypto_paillier/paillier.md
diff --git a/CTFs_and_WarGames/2014-ASIS-CTF/crypto_paillier/paillier_my_poc.py b/CTFs_and_WarGames/2014/ASIS-final/crypto_paillier/paillier_my_poc.py
similarity index 100%
rename from CTFs_and_WarGames/2014-ASIS-CTF/crypto_paillier/paillier_my_poc.py
rename to CTFs_and_WarGames/2014/ASIS-final/crypto_paillier/paillier_my_poc.py
diff --git a/CTFs_and_WarGames/2014-CSAW-CTF/README.md b/CTFs_and_WarGames/2014/CSAW-quals/README.md
similarity index 100%
rename from CTFs_and_WarGames/2014-CSAW-CTF/README.md
rename to CTFs_and_WarGames/2014/CSAW-quals/README.md
diff --git a/CTFs_and_WarGames/2014-CSAW-CTF/cryptography/crypto-200/__init__.py b/CTFs_and_WarGames/2014/CSAW-quals/cryptography/crypto-200/__init__.py
similarity index 100%
rename from CTFs_and_WarGames/2014-CSAW-CTF/cryptography/crypto-200/__init__.py
rename to CTFs_and_WarGames/2014/CSAW-quals/cryptography/crypto-200/__init__.py
diff --git a/CTFs_and_WarGames/2014-CSAW-CTF/cryptography/crypto-200/bt3gl b/CTFs_and_WarGames/2014/CSAW-quals/cryptography/crypto-200/bt3gl
similarity index 100%
rename from CTFs_and_WarGames/2014-CSAW-CTF/cryptography/crypto-200/bt3gl
rename to CTFs_and_WarGames/2014/CSAW-quals/cryptography/crypto-200/bt3gl
diff --git a/CTFs_and_WarGames/2014-CSAW-CTF/cryptography/crypto-200/caesarCipher.py b/CTFs_and_WarGames/2014/CSAW-quals/cryptography/crypto-200/caesarCipher.py
similarity index 100%
rename from CTFs_and_WarGames/2014-CSAW-CTF/cryptography/crypto-200/caesarCipher.py
rename to CTFs_and_WarGames/2014/CSAW-quals/cryptography/crypto-200/caesarCipher.py
diff --git a/CTFs_and_WarGames/2014-CSAW-CTF/cryptography/crypto-200/crypto-200 b/CTFs_and_WarGames/2014/CSAW-quals/cryptography/crypto-200/crypto-200
similarity index 100%
rename from CTFs_and_WarGames/2014-CSAW-CTF/cryptography/crypto-200/crypto-200
rename to CTFs_and_WarGames/2014/CSAW-quals/cryptography/crypto-200/crypto-200
diff --git a/CTFs_and_WarGames/2014-CSAW-CTF/cryptography/crypto-200/from_the_net/psifer-school.php b/CTFs_and_WarGames/2014/CSAW-quals/cryptography/crypto-200/from_the_net/psifer-school.php
similarity index 100%
rename from CTFs_and_WarGames/2014-CSAW-CTF/cryptography/crypto-200/from_the_net/psifer-school.php
rename to CTFs_and_WarGames/2014/CSAW-quals/cryptography/crypto-200/from_the_net/psifer-school.php
diff --git a/CTFs_and_WarGames/2014-CSAW-CTF/cryptography/crypto-200/from_the_net/psifer-school.pl b/CTFs_and_WarGames/2014/CSAW-quals/cryptography/crypto-200/from_the_net/psifer-school.pl
similarity index 100%
rename from CTFs_and_WarGames/2014-CSAW-CTF/cryptography/crypto-200/from_the_net/psifer-school.pl
rename to CTFs_and_WarGames/2014/CSAW-quals/cryptography/crypto-200/from_the_net/psifer-school.pl
diff --git a/CTFs_and_WarGames/2014-CSAW-CTF/cryptography/crypto-200/locate b/CTFs_and_WarGames/2014/CSAW-quals/cryptography/crypto-200/locate
similarity index 100%
rename from CTFs_and_WarGames/2014-CSAW-CTF/cryptography/crypto-200/locate
rename to CTFs_and_WarGames/2014/CSAW-quals/cryptography/crypto-200/locate
diff --git a/CTFs_and_WarGames/2014-CSAW-CTF/cryptography/crypto-200/psifer-school.py b/CTFs_and_WarGames/2014/CSAW-quals/cryptography/crypto-200/psifer-school.py
similarity index 100%
rename from CTFs_and_WarGames/2014-CSAW-CTF/cryptography/crypto-200/psifer-school.py
rename to CTFs_and_WarGames/2014/CSAW-quals/cryptography/crypto-200/psifer-school.py
diff --git a/CTFs_and_WarGames/2014-CSAW-CTF/cryptography/crypto-200/pygenere.py b/CTFs_and_WarGames/2014/CSAW-quals/cryptography/crypto-200/pygenere.py
similarity index 100%
rename from CTFs_and_WarGames/2014-CSAW-CTF/cryptography/crypto-200/pygenere.py
rename to CTFs_and_WarGames/2014/CSAW-quals/cryptography/crypto-200/pygenere.py
diff --git a/CTFs_and_WarGames/2014-CSAW-CTF/cryptography/crypto-200/scully b/CTFs_and_WarGames/2014/CSAW-quals/cryptography/crypto-200/scully
similarity index 100%
rename from CTFs_and_WarGames/2014-CSAW-CTF/cryptography/crypto-200/scully
rename to CTFs_and_WarGames/2014/CSAW-quals/cryptography/crypto-200/scully
diff --git a/CTFs_and_WarGames/2014-CSAW-CTF/forensics/README.md b/CTFs_and_WarGames/2014/CSAW-quals/forensics/README.md
similarity index 100%
rename from CTFs_and_WarGames/2014-CSAW-CTF/forensics/README.md
rename to CTFs_and_WarGames/2014/CSAW-quals/forensics/README.md
diff --git a/CTFs_and_WarGames/2014-CSAW-CTF/forensics/big-data/README.md b/CTFs_and_WarGames/2014/CSAW-quals/forensics/big-data/README.md
similarity index 100%
rename from CTFs_and_WarGames/2014-CSAW-CTF/forensics/big-data/README.md
rename to CTFs_and_WarGames/2014/CSAW-quals/forensics/big-data/README.md
diff --git a/CTFs_and_WarGames/2014-CSAW-CTF/forensics/big-data/firefox.mem.zip b/CTFs_and_WarGames/2014/CSAW-quals/forensics/big-data/firefox.mem.zip
similarity index 100%
rename from CTFs_and_WarGames/2014-CSAW-CTF/forensics/big-data/firefox.mem.zip
rename to CTFs_and_WarGames/2014/CSAW-quals/forensics/big-data/firefox.mem.zip
diff --git a/CTFs_and_WarGames/2014-CSAW-CTF/forensics/fluffy/CSAW2014-FluffyNoMore-v0.1.tar.bz2 b/CTFs_and_WarGames/2014/CSAW-quals/forensics/fluffy/CSAW2014-FluffyNoMore-v0.1.tar.bz2
similarity index 100%
rename from CTFs_and_WarGames/2014-CSAW-CTF/forensics/fluffy/CSAW2014-FluffyNoMore-v0.1.tar.bz2
rename to CTFs_and_WarGames/2014/CSAW-quals/forensics/fluffy/CSAW2014-FluffyNoMore-v0.1.tar.bz2
diff --git a/CTFs_and_WarGames/2014-CSAW-CTF/forensics/fluffy/README.md b/CTFs_and_WarGames/2014/CSAW-quals/forensics/fluffy/README.md
similarity index 100%
rename from CTFs_and_WarGames/2014-CSAW-CTF/forensics/fluffy/README.md
rename to CTFs_and_WarGames/2014/CSAW-quals/forensics/fluffy/README.md
diff --git a/CTFs_and_WarGames/2014-CSAW-CTF/forensics/fluffy/analytics.js b/CTFs_and_WarGames/2014/CSAW-quals/forensics/fluffy/analytics.js
similarity index 100%
rename from CTFs_and_WarGames/2014-CSAW-CTF/forensics/fluffy/analytics.js
rename to CTFs_and_WarGames/2014/CSAW-quals/forensics/fluffy/analytics.js
diff --git a/CTFs_and_WarGames/2014-CSAW-CTF/forensics/fluffy/announcemen.pdf b/CTFs_and_WarGames/2014/CSAW-quals/forensics/fluffy/announcemen.pdf
similarity index 100%
rename from CTFs_and_WarGames/2014-CSAW-CTF/forensics/fluffy/announcemen.pdf
rename to CTFs_and_WarGames/2014/CSAW-quals/forensics/fluffy/announcemen.pdf
diff --git a/CTFs_and_WarGames/2014-CSAW-CTF/forensics/fluffy/html5.js b/CTFs_and_WarGames/2014/CSAW-quals/forensics/fluffy/html5.js
similarity index 100%
rename from CTFs_and_WarGames/2014-CSAW-CTF/forensics/fluffy/html5.js
rename to CTFs_and_WarGames/2014/CSAW-quals/forensics/fluffy/html5.js
diff --git a/CTFs_and_WarGames/2014-CSAW-CTF/forensics/fluffy/pdf-parser.py b/CTFs_and_WarGames/2014/CSAW-quals/forensics/fluffy/pdf-parser.py
similarity index 100%
rename from CTFs_and_WarGames/2014-CSAW-CTF/forensics/fluffy/pdf-parser.py
rename to CTFs_and_WarGames/2014/CSAW-quals/forensics/fluffy/pdf-parser.py
diff --git a/CTFs_and_WarGames/2014-CSAW-CTF/forensics/fluffy/unpacked.txt b/CTFs_and_WarGames/2014/CSAW-quals/forensics/fluffy/unpacked.txt
similarity index 100%
rename from CTFs_and_WarGames/2014-CSAW-CTF/forensics/fluffy/unpacked.txt
rename to CTFs_and_WarGames/2014/CSAW-quals/forensics/fluffy/unpacked.txt
diff --git a/CTFs_and_WarGames/2014-CSAW-CTF/forensics/obscurity/README.md b/CTFs_and_WarGames/2014/CSAW-quals/forensics/obscurity/README.md
similarity index 100%
rename from CTFs_and_WarGames/2014-CSAW-CTF/forensics/obscurity/README.md
rename to CTFs_and_WarGames/2014/CSAW-quals/forensics/obscurity/README.md
diff --git a/CTFs_and_WarGames/2014-CSAW-CTF/forensics/obscurity/pdf-parser.py b/CTFs_and_WarGames/2014/CSAW-quals/forensics/obscurity/pdf-parser.py
similarity index 100%
rename from CTFs_and_WarGames/2014-CSAW-CTF/forensics/obscurity/pdf-parser.py
rename to CTFs_and_WarGames/2014/CSAW-quals/forensics/obscurity/pdf-parser.py
diff --git a/CTFs_and_WarGames/2014-CSAW-CTF/forensics/obscurity/pdf.pdf b/CTFs_and_WarGames/2014/CSAW-quals/forensics/obscurity/pdf.pdf
similarity index 100%
rename from CTFs_and_WarGames/2014-CSAW-CTF/forensics/obscurity/pdf.pdf
rename to CTFs_and_WarGames/2014/CSAW-quals/forensics/obscurity/pdf.pdf
diff --git a/CTFs_and_WarGames/2014-CSAW-CTF/forensics/obscurity/pdfid.py b/CTFs_and_WarGames/2014/CSAW-quals/forensics/obscurity/pdfid.py
similarity index 100%
rename from CTFs_and_WarGames/2014-CSAW-CTF/forensics/obscurity/pdfid.py
rename to CTFs_and_WarGames/2014/CSAW-quals/forensics/obscurity/pdfid.py
diff --git a/CTFs_and_WarGames/2014-CSAW-CTF/forensics/why-not-sftp/README.md b/CTFs_and_WarGames/2014/CSAW-quals/forensics/why-not-sftp/README.md
similarity index 100%
rename from CTFs_and_WarGames/2014-CSAW-CTF/forensics/why-not-sftp/README.md
rename to CTFs_and_WarGames/2014/CSAW-quals/forensics/why-not-sftp/README.md
diff --git a/CTFs_and_WarGames/2014-CSAW-CTF/forensics/why-not-sftp/traffic-5.pcap b/CTFs_and_WarGames/2014/CSAW-quals/forensics/why-not-sftp/traffic-5.pcap
similarity index 100%
rename from CTFs_and_WarGames/2014-CSAW-CTF/forensics/why-not-sftp/traffic-5.pcap
rename to CTFs_and_WarGames/2014/CSAW-quals/forensics/why-not-sftp/traffic-5.pcap
diff --git a/CTFs_and_WarGames/2014-CSAW-CTF/networking/README.md b/CTFs_and_WarGames/2014/CSAW-quals/networking/README.md
similarity index 100%
rename from CTFs_and_WarGames/2014-CSAW-CTF/networking/README.md
rename to CTFs_and_WarGames/2014/CSAW-quals/networking/README.md
diff --git a/CTFs_and_WarGames/2014-CSAW-CTF/networking/pcap.pcapng b/CTFs_and_WarGames/2014/CSAW-quals/networking/pcap.pcapng
similarity index 100%
rename from CTFs_and_WarGames/2014-CSAW-CTF/networking/pcap.pcapng
rename to CTFs_and_WarGames/2014/CSAW-quals/networking/pcap.pcapng
diff --git a/CTFs_and_WarGames/2014-CSAW-CTF/reverse-engineering/eggshells-100/README.md b/CTFs_and_WarGames/2014/CSAW-quals/reverse-engineering/eggshells-100/README.md
similarity index 100%
rename from CTFs_and_WarGames/2014-CSAW-CTF/reverse-engineering/eggshells-100/README.md
rename to CTFs_and_WarGames/2014/CSAW-quals/reverse-engineering/eggshells-100/README.md
diff --git a/CTFs_and_WarGames/2014-CSAW-CTF/reverse-engineering/eggshells-100/eggshells-master/capstone.py b/CTFs_and_WarGames/2014/CSAW-quals/reverse-engineering/eggshells-100/eggshells-master/capstone.py
similarity index 100%
rename from CTFs_and_WarGames/2014-CSAW-CTF/reverse-engineering/eggshells-100/eggshells-master/capstone.py
rename to CTFs_and_WarGames/2014/CSAW-quals/reverse-engineering/eggshells-100/eggshells-master/capstone.py
diff --git a/CTFs_and_WarGames/2014-CSAW-CTF/reverse-engineering/eggshells-100/eggshells-master/distorm.py b/CTFs_and_WarGames/2014/CSAW-quals/reverse-engineering/eggshells-100/eggshells-master/distorm.py
similarity index 100%
rename from CTFs_and_WarGames/2014-CSAW-CTF/reverse-engineering/eggshells-100/eggshells-master/distorm.py
rename to CTFs_and_WarGames/2014/CSAW-quals/reverse-engineering/eggshells-100/eggshells-master/distorm.py
diff --git a/CTFs_and_WarGames/2014-CSAW-CTF/reverse-engineering/eggshells-100/eggshells-master/interpreter.py b/CTFs_and_WarGames/2014/CSAW-quals/reverse-engineering/eggshells-100/eggshells-master/interpreter.py
similarity index 100%
rename from CTFs_and_WarGames/2014-CSAW-CTF/reverse-engineering/eggshells-100/eggshells-master/interpreter.py
rename to CTFs_and_WarGames/2014/CSAW-quals/reverse-engineering/eggshells-100/eggshells-master/interpreter.py
diff --git a/CTFs_and_WarGames/2014-CSAW-CTF/reverse-engineering/eggshells-100/eggshells-master/lol.py b/CTFs_and_WarGames/2014/CSAW-quals/reverse-engineering/eggshells-100/eggshells-master/lol.py
similarity index 100%
rename from CTFs_and_WarGames/2014-CSAW-CTF/reverse-engineering/eggshells-100/eggshells-master/lol.py
rename to CTFs_and_WarGames/2014/CSAW-quals/reverse-engineering/eggshells-100/eggshells-master/lol.py
diff --git a/CTFs_and_WarGames/2014-CSAW-CTF/reverse-engineering/eggshells-100/eggshells-master/main.py b/CTFs_and_WarGames/2014/CSAW-quals/reverse-engineering/eggshells-100/eggshells-master/main.py
similarity index 100%
rename from CTFs_and_WarGames/2014-CSAW-CTF/reverse-engineering/eggshells-100/eggshells-master/main.py
rename to CTFs_and_WarGames/2014/CSAW-quals/reverse-engineering/eggshells-100/eggshells-master/main.py
diff --git a/CTFs_and_WarGames/2014-CSAW-CTF/reverse-engineering/eggshells-100/eggshells-master/nasm.py b/CTFs_and_WarGames/2014/CSAW-quals/reverse-engineering/eggshells-100/eggshells-master/nasm.py
similarity index 100%
rename from CTFs_and_WarGames/2014-CSAW-CTF/reverse-engineering/eggshells-100/eggshells-master/nasm.py
rename to CTFs_and_WarGames/2014/CSAW-quals/reverse-engineering/eggshells-100/eggshells-master/nasm.py
diff --git a/CTFs_and_WarGames/2014-CSAW-CTF/reverse-engineering/eggshells-100/eggshells-master/nasm/.DS_Store b/CTFs_and_WarGames/2014/CSAW-quals/reverse-engineering/eggshells-100/eggshells-master/nasm/.DS_Store
similarity index 100%
rename from CTFs_and_WarGames/2014-CSAW-CTF/reverse-engineering/eggshells-100/eggshells-master/nasm/.DS_Store
rename to CTFs_and_WarGames/2014/CSAW-quals/reverse-engineering/eggshells-100/eggshells-master/nasm/.DS_Store
diff --git a/CTFs_and_WarGames/2014-CSAW-CTF/reverse-engineering/eggshells-100/eggshells-master/nasm/LICENSE b/CTFs_and_WarGames/2014/CSAW-quals/reverse-engineering/eggshells-100/eggshells-master/nasm/LICENSE
similarity index 100%
rename from CTFs_and_WarGames/2014-CSAW-CTF/reverse-engineering/eggshells-100/eggshells-master/nasm/LICENSE
rename to CTFs_and_WarGames/2014/CSAW-quals/reverse-engineering/eggshells-100/eggshells-master/nasm/LICENSE
diff --git a/CTFs_and_WarGames/2014-CSAW-CTF/reverse-engineering/eggshells-100/eggshells-master/nasm/nasm.exe b/CTFs_and_WarGames/2014/CSAW-quals/reverse-engineering/eggshells-100/eggshells-master/nasm/nasm.exe
similarity index 100%
rename from CTFs_and_WarGames/2014-CSAW-CTF/reverse-engineering/eggshells-100/eggshells-master/nasm/nasm.exe
rename to CTFs_and_WarGames/2014/CSAW-quals/reverse-engineering/eggshells-100/eggshells-master/nasm/nasm.exe
diff --git a/CTFs_and_WarGames/2014-CSAW-CTF/reverse-engineering/eggshells-100/eggshells-master/nasm/ndisasm.exe b/CTFs_and_WarGames/2014/CSAW-quals/reverse-engineering/eggshells-100/eggshells-master/nasm/ndisasm.exe
similarity index 100%
rename from CTFs_and_WarGames/2014-CSAW-CTF/reverse-engineering/eggshells-100/eggshells-master/nasm/ndisasm.exe
rename to CTFs_and_WarGames/2014/CSAW-quals/reverse-engineering/eggshells-100/eggshells-master/nasm/ndisasm.exe
diff --git a/CTFs_and_WarGames/2014-CSAW-CTF/reverse-engineering/eggshells-100/eggshells-master/nasm/rdoff/ldrdf.exe b/CTFs_and_WarGames/2014/CSAW-quals/reverse-engineering/eggshells-100/eggshells-master/nasm/rdoff/ldrdf.exe
similarity index 100%
rename from CTFs_and_WarGames/2014-CSAW-CTF/reverse-engineering/eggshells-100/eggshells-master/nasm/rdoff/ldrdf.exe
rename to CTFs_and_WarGames/2014/CSAW-quals/reverse-engineering/eggshells-100/eggshells-master/nasm/rdoff/ldrdf.exe
diff --git a/CTFs_and_WarGames/2014-CSAW-CTF/reverse-engineering/eggshells-100/eggshells-master/nasm/rdoff/rdf2bin.exe b/CTFs_and_WarGames/2014/CSAW-quals/reverse-engineering/eggshells-100/eggshells-master/nasm/rdoff/rdf2bin.exe
similarity index 100%
rename from CTFs_and_WarGames/2014-CSAW-CTF/reverse-engineering/eggshells-100/eggshells-master/nasm/rdoff/rdf2bin.exe
rename to CTFs_and_WarGames/2014/CSAW-quals/reverse-engineering/eggshells-100/eggshells-master/nasm/rdoff/rdf2bin.exe
diff --git a/CTFs_and_WarGames/2014-CSAW-CTF/reverse-engineering/eggshells-100/eggshells-master/nasm/rdoff/rdf2com.exe b/CTFs_and_WarGames/2014/CSAW-quals/reverse-engineering/eggshells-100/eggshells-master/nasm/rdoff/rdf2com.exe
similarity index 100%
rename from CTFs_and_WarGames/2014-CSAW-CTF/reverse-engineering/eggshells-100/eggshells-master/nasm/rdoff/rdf2com.exe
rename to CTFs_and_WarGames/2014/CSAW-quals/reverse-engineering/eggshells-100/eggshells-master/nasm/rdoff/rdf2com.exe
diff --git a/CTFs_and_WarGames/2014-CSAW-CTF/reverse-engineering/eggshells-100/eggshells-master/nasm/rdoff/rdf2ihx.exe b/CTFs_and_WarGames/2014/CSAW-quals/reverse-engineering/eggshells-100/eggshells-master/nasm/rdoff/rdf2ihx.exe
similarity index 100%
rename from CTFs_and_WarGames/2014-CSAW-CTF/reverse-engineering/eggshells-100/eggshells-master/nasm/rdoff/rdf2ihx.exe
rename to CTFs_and_WarGames/2014/CSAW-quals/reverse-engineering/eggshells-100/eggshells-master/nasm/rdoff/rdf2ihx.exe
diff --git a/CTFs_and_WarGames/2014-CSAW-CTF/reverse-engineering/eggshells-100/eggshells-master/nasm/rdoff/rdf2ith.exe b/CTFs_and_WarGames/2014/CSAW-quals/reverse-engineering/eggshells-100/eggshells-master/nasm/rdoff/rdf2ith.exe
similarity index 100%
rename from CTFs_and_WarGames/2014-CSAW-CTF/reverse-engineering/eggshells-100/eggshells-master/nasm/rdoff/rdf2ith.exe
rename to CTFs_and_WarGames/2014/CSAW-quals/reverse-engineering/eggshells-100/eggshells-master/nasm/rdoff/rdf2ith.exe
diff --git a/CTFs_and_WarGames/2014-CSAW-CTF/reverse-engineering/eggshells-100/eggshells-master/nasm/rdoff/rdf2srec.exe b/CTFs_and_WarGames/2014/CSAW-quals/reverse-engineering/eggshells-100/eggshells-master/nasm/rdoff/rdf2srec.exe
similarity index 100%
rename from CTFs_and_WarGames/2014-CSAW-CTF/reverse-engineering/eggshells-100/eggshells-master/nasm/rdoff/rdf2srec.exe
rename to CTFs_and_WarGames/2014/CSAW-quals/reverse-engineering/eggshells-100/eggshells-master/nasm/rdoff/rdf2srec.exe
diff --git a/CTFs_and_WarGames/2014-CSAW-CTF/reverse-engineering/eggshells-100/eggshells-master/nasm/rdoff/rdfdump.exe b/CTFs_and_WarGames/2014/CSAW-quals/reverse-engineering/eggshells-100/eggshells-master/nasm/rdoff/rdfdump.exe
similarity index 100%
rename from CTFs_and_WarGames/2014-CSAW-CTF/reverse-engineering/eggshells-100/eggshells-master/nasm/rdoff/rdfdump.exe
rename to CTFs_and_WarGames/2014/CSAW-quals/reverse-engineering/eggshells-100/eggshells-master/nasm/rdoff/rdfdump.exe
diff --git a/CTFs_and_WarGames/2014-CSAW-CTF/reverse-engineering/eggshells-100/eggshells-master/nasm/rdoff/rdflib.exe b/CTFs_and_WarGames/2014/CSAW-quals/reverse-engineering/eggshells-100/eggshells-master/nasm/rdoff/rdflib.exe
similarity index 100%
rename from CTFs_and_WarGames/2014-CSAW-CTF/reverse-engineering/eggshells-100/eggshells-master/nasm/rdoff/rdflib.exe
rename to CTFs_and_WarGames/2014/CSAW-quals/reverse-engineering/eggshells-100/eggshells-master/nasm/rdoff/rdflib.exe
diff --git a/CTFs_and_WarGames/2014-CSAW-CTF/reverse-engineering/eggshells-100/eggshells-master/nasm/rdoff/rdx.exe b/CTFs_and_WarGames/2014/CSAW-quals/reverse-engineering/eggshells-100/eggshells-master/nasm/rdoff/rdx.exe
similarity index 100%
rename from CTFs_and_WarGames/2014-CSAW-CTF/reverse-engineering/eggshells-100/eggshells-master/nasm/rdoff/rdx.exe
rename to CTFs_and_WarGames/2014/CSAW-quals/reverse-engineering/eggshells-100/eggshells-master/nasm/rdoff/rdx.exe
diff --git a/CTFs_and_WarGames/2014-CSAW-CTF/reverse-engineering/eggshells-100/eggshells-master/server.py b/CTFs_and_WarGames/2014/CSAW-quals/reverse-engineering/eggshells-100/eggshells-master/server.py
similarity index 100%
rename from CTFs_and_WarGames/2014-CSAW-CTF/reverse-engineering/eggshells-100/eggshells-master/server.py
rename to CTFs_and_WarGames/2014/CSAW-quals/reverse-engineering/eggshells-100/eggshells-master/server.py
diff --git a/CTFs_and_WarGames/2014-CSAW-CTF/reverse-engineering/eggshells-100/eggshells-master/shellcode.py b/CTFs_and_WarGames/2014/CSAW-quals/reverse-engineering/eggshells-100/eggshells-master/shellcode.py
similarity index 100%
rename from CTFs_and_WarGames/2014-CSAW-CTF/reverse-engineering/eggshells-100/eggshells-master/shellcode.py
rename to CTFs_and_WarGames/2014/CSAW-quals/reverse-engineering/eggshells-100/eggshells-master/shellcode.py
diff --git a/CTFs_and_WarGames/2014-CSAW-CTF/reverse-engineering/eggshells-100/eggshells-master/wrapper.py b/CTFs_and_WarGames/2014/CSAW-quals/reverse-engineering/eggshells-100/eggshells-master/wrapper.py
similarity index 100%
rename from CTFs_and_WarGames/2014-CSAW-CTF/reverse-engineering/eggshells-100/eggshells-master/wrapper.py
rename to CTFs_and_WarGames/2014/CSAW-quals/reverse-engineering/eggshells-100/eggshells-master/wrapper.py
diff --git a/CTFs_and_WarGames/2014-Hack.lu-CTF/300_peace_pipe.py b/CTFs_and_WarGames/2014/Hack.lu/300_peace_pipe.py
similarity index 100%
rename from CTFs_and_WarGames/2014-Hack.lu-CTF/300_peace_pipe.py
rename to CTFs_and_WarGames/2014/Hack.lu/300_peace_pipe.py
diff --git a/CTFs_and_WarGames/2014-Hack.lu-CTF/SSH_implementation_example.py b/CTFs_and_WarGames/2014/Hack.lu/SSH_implementation_example.py
similarity index 100%
rename from CTFs_and_WarGames/2014-Hack.lu-CTF/SSH_implementation_example.py
rename to CTFs_and_WarGames/2014/Hack.lu/SSH_implementation_example.py
diff --git a/CTFs_and_WarGames/STRIPE_1-2-3/1/pickle_attack.sh b/CTFs_and_WarGames/2014/STRIPE_1-2-3/1/pickle_attack.sh
similarity index 100%
rename from CTFs_and_WarGames/STRIPE_1-2-3/1/pickle_attack.sh
rename to CTFs_and_WarGames/2014/STRIPE_1-2-3/1/pickle_attack.sh
diff --git a/CTFs_and_WarGames/STRIPE_1-2-3/1/shellcode.py b/CTFs_and_WarGames/2014/STRIPE_1-2-3/1/shellcode.py
similarity index 100%
rename from CTFs_and_WarGames/STRIPE_1-2-3/1/shellcode.py
rename to CTFs_and_WarGames/2014/STRIPE_1-2-3/1/shellcode.py
diff --git a/CTFs_and_WarGames/STRIPE_1-2-3/1/shellcode/Makefile b/CTFs_and_WarGames/2014/STRIPE_1-2-3/1/shellcode/Makefile
similarity index 100%
rename from CTFs_and_WarGames/STRIPE_1-2-3/1/shellcode/Makefile
rename to CTFs_and_WarGames/2014/STRIPE_1-2-3/1/shellcode/Makefile
diff --git a/CTFs_and_WarGames/STRIPE_1-2-3/1/shellcode/how_to_compile_asm_32.md b/CTFs_and_WarGames/2014/STRIPE_1-2-3/1/shellcode/how_to_compile_asm_32.md
similarity index 100%
rename from CTFs_and_WarGames/STRIPE_1-2-3/1/shellcode/how_to_compile_asm_32.md
rename to CTFs_and_WarGames/2014/STRIPE_1-2-3/1/shellcode/how_to_compile_asm_32.md
diff --git a/CTFs_and_WarGames/STRIPE_1-2-3/1/shellcode/simplest_shellcode.c b/CTFs_and_WarGames/2014/STRIPE_1-2-3/1/shellcode/simplest_shellcode.c
similarity index 100%
rename from CTFs_and_WarGames/STRIPE_1-2-3/1/shellcode/simplest_shellcode.c
rename to CTFs_and_WarGames/2014/STRIPE_1-2-3/1/shellcode/simplest_shellcode.c
diff --git a/CTFs_and_WarGames/STRIPE_1-2-3/1/shellcode/simplest_shellcode_32.s b/CTFs_and_WarGames/2014/STRIPE_1-2-3/1/shellcode/simplest_shellcode_32.s
similarity index 100%
rename from CTFs_and_WarGames/STRIPE_1-2-3/1/shellcode/simplest_shellcode_32.s
rename to CTFs_and_WarGames/2014/STRIPE_1-2-3/1/shellcode/simplest_shellcode_32.s
diff --git a/CTFs_and_WarGames/STRIPE_1-2-3/1/st_ctf1_1.sh b/CTFs_and_WarGames/2014/STRIPE_1-2-3/1/st_ctf1_1.sh
similarity index 100%
rename from CTFs_and_WarGames/STRIPE_1-2-3/1/st_ctf1_1.sh
rename to CTFs_and_WarGames/2014/STRIPE_1-2-3/1/st_ctf1_1.sh
diff --git a/CTFs_and_WarGames/STRIPE_1-2-3/1/st_ctf1_2.sh b/CTFs_and_WarGames/2014/STRIPE_1-2-3/1/st_ctf1_2.sh
similarity index 100%
rename from CTFs_and_WarGames/STRIPE_1-2-3/1/st_ctf1_2.sh
rename to CTFs_and_WarGames/2014/STRIPE_1-2-3/1/st_ctf1_2.sh
diff --git a/CTFs_and_WarGames/STRIPE_1-2-3/1/st_ctf1_3.sh b/CTFs_and_WarGames/2014/STRIPE_1-2-3/1/st_ctf1_3.sh
similarity index 100%
rename from CTFs_and_WarGames/STRIPE_1-2-3/1/st_ctf1_3.sh
rename to CTFs_and_WarGames/2014/STRIPE_1-2-3/1/st_ctf1_3.sh
diff --git a/CTFs_and_WarGames/STRIPE_1-2-3/1/timming_attack.sh b/CTFs_and_WarGames/2014/STRIPE_1-2-3/1/timming_attack.sh
similarity index 100%
rename from CTFs_and_WarGames/STRIPE_1-2-3/1/timming_attack.sh
rename to CTFs_and_WarGames/2014/STRIPE_1-2-3/1/timming_attack.sh
diff --git a/CTFs_and_WarGames/CTFs-TRIVIA-COLLECTION.md b/CTFs_and_WarGames/CTFs-TRIVIA-COLLECTION.md
deleted file mode 100644
index 29ddb20..0000000
--- a/CTFs_and_WarGames/CTFs-TRIVIA-COLLECTION.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# Trivia List (For Reference)
-___
-
-## CSAW CTF 2014
-
-1. This is the name of the new USENIX workshop that featured papers on CTFs being used for education. Answer: **3GSE**
-
-2. This x86 instruction is an alias for pop eip/rip.
-Answer: **RET**
-
-3. This is a type of informal security meetup that has been gaining popularity in different cities over the last several years.  Answer: **CitySec**
-
-4. This is what geohot and other members of the CTF community are calling live streamed CTF competitions where spectators can watch competitors screens as they solve challenges. Answer: **livectf**
-
-5. On this day in November, the CSAW Career Fair takes place in Brooklyn, New York. Answer: **14**
-
-6. This is the Twitter handle of the student who runs CSAW CTF. Answer: **poopsec**
- 
-
-
-
diff --git a/CTFs_and_WarGames/README.md b/CTFs_and_WarGames/README.md
index 172c2e1..afcc51d 100644
--- a/CTFs_and_WarGames/README.md
+++ b/CTFs_and_WarGames/README.md
@@ -1,15 +1,75 @@
 CTFs & Wargames Archives
 ========================
 
+# CTFs
+
 ## 2014
 
-
-### CTFs
 - ASIS Final
 - CSAW Quals
 - Hack.lu
+- Stripe 1, 2, 3
+- 9447
 
 
-### Wargames
+---
+# Wargames
+
+## 2014
+
 - OverTheWire: Krypton, Narnia
 
+
+----
+
+# Trivia List (For Reference)
+
+## CSAW CTF 2014
+
+1. This is the name of the new USENIX workshop that featured papers on CTFs being used for education. Answer: **3GSE**
+
+2. This x86 instruction is an alias for pop eip/rip.
+Answer: **RET**
+
+3. This is a type of informal security meetup that has been gaining popularity in different cities over the last several years.  Answer: **CitySec**
+
+4. This is what geohot and other members of the CTF community are calling live streamed CTF competitions where spectators can watch competitors screens as they solve challenges. Answer: **livectf**
+
+5. On this day in November, the CSAW Career Fair takes place in Brooklyn, New York. Answer: **14**
+
+6. This is the Twitter handle of the student who runs CSAW CTF. Answer: **poopsec**
+ 
+
+---
+# Recon
+
+
+### Searching the Internets
+
+The recon problems usually give you someone/something's name and a task or a hint to find some specific information about it. So the first thing is of course google it.
+
+Google anything using keywords such as ```filetype:cgi inurl:cgi-bin```
+
+
+### In addition we can look at:
+
+- Facebook, Twitter, Linkedin, Google+, reddit,  /r/netsec.
+- IRC: with **/whois **.
+- [namechk] 
+- Github: check in the commit history.
+
+
+### Finding pictures:
+
+- [karmadecay]
+- [tineye]
+- [images.google.com]
+
+
+[karmadecay]: http://karmadecay.com/
+[tineye]:  https://www.tineye.com/
+[images.google.com]: https://images.google.com/?gws_rd=ssl
+[namechk]: http://namechk.com
+
+
+----
diff --git a/text.txt b/text.txt
deleted file mode 100644
index 2d9d6f5..0000000
--- a/text.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Hello everyone!
-Linux is really cool.
-Let's learn more!