diff --git a/TODO.md b/TODO.md
deleted file mode 100644
index 33713b9..0000000
--- a/TODO.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# Objectivos de acordo com o enunciado 
-
-## Goals
-- [X] Configure a tunnel in the "road warrior"
-- [X] Enable two factor authentication with OpenSSL and Apache services
-- [X] Manage PKI: certification authorities, X.509 certificates, revocation and OCSP.
-
-
diff --git a/VM_CONFIG.sh b/assignment2/VM_CONFIG.sh
old mode 100755
new mode 100644
similarity index 100%
rename from VM_CONFIG.sh
rename to assignment2/VM_CONFIG.sh
diff --git a/VM_OPENSSL_APACHE.sh b/assignment2/VM_OPENSSL_APACHE.sh
similarity index 100%
rename from VM_OPENSSL_APACHE.sh
rename to assignment2/VM_OPENSSL_APACHE.sh
diff --git a/VM_ROAD_WARRIOR.sh b/assignment2/VM_ROAD_WARRIOR.sh
similarity index 100%
rename from VM_ROAD_WARRIOR.sh
rename to assignment2/VM_ROAD_WARRIOR.sh
diff --git a/VM_VPN_GATEWAY.sh b/assignment2/VM_VPN_GATEWAY.sh
similarity index 100%
rename from VM_VPN_GATEWAY.sh
rename to assignment2/VM_VPN_GATEWAY.sh
diff --git a/ca/1000.pem b/assignment2/ca/1000.pem
similarity index 100%
rename from ca/1000.pem
rename to assignment2/ca/1000.pem
diff --git a/ca/1001.pem b/assignment2/ca/1001.pem
similarity index 100%
rename from ca/1001.pem
rename to assignment2/ca/1001.pem
diff --git a/ca/1002.pem b/assignment2/ca/1002.pem
similarity index 100%
rename from ca/1002.pem
rename to assignment2/ca/1002.pem
diff --git a/ca/1003.pem b/assignment2/ca/1003.pem
similarity index 100%
rename from ca/1003.pem
rename to assignment2/ca/1003.pem
diff --git a/ca/apache.crt b/assignment2/ca/apache.crt
similarity index 100%
rename from ca/apache.crt
rename to assignment2/ca/apache.crt
diff --git a/ca/apache.crt.old b/assignment2/ca/apache.crt.old
similarity index 100%
rename from ca/apache.crt.old
rename to assignment2/ca/apache.crt.old
diff --git a/ca/apache.csr b/assignment2/ca/apache.csr
similarity index 100%
rename from ca/apache.csr
rename to assignment2/ca/apache.csr
diff --git a/ca/apache.key b/assignment2/ca/apache.key
similarity index 100%
rename from ca/apache.key
rename to assignment2/ca/apache.key
diff --git a/ca/ca.crt b/assignment2/ca/ca.crt
similarity index 100%
rename from ca/ca.crt
rename to assignment2/ca/ca.crt
diff --git a/ca/ca.key b/assignment2/ca/ca.key
similarity index 100%
rename from ca/ca.key
rename to assignment2/ca/ca.key
diff --git a/ca/cheese.cfg b/assignment2/ca/cheese.cfg
similarity index 100%
rename from ca/cheese.cfg
rename to assignment2/ca/cheese.cfg
diff --git a/ca/create_all_keys.sh b/assignment2/ca/create_all_keys.sh
old mode 100755
new mode 100644
similarity index 100%
rename from ca/create_all_keys.sh
rename to assignment2/ca/create_all_keys.sh
diff --git a/ca/dh2048.pem b/assignment2/ca/dh2048.pem
similarity index 100%
rename from ca/dh2048.pem
rename to assignment2/ca/dh2048.pem
diff --git a/ca/index.txt b/assignment2/ca/index.txt
similarity index 100%
rename from ca/index.txt
rename to assignment2/ca/index.txt
diff --git a/ca/index.txt.attr b/assignment2/ca/index.txt.attr
similarity index 100%
rename from ca/index.txt.attr
rename to assignment2/ca/index.txt.attr
diff --git a/ca/index.txt.attr.old b/assignment2/ca/index.txt.attr.old
similarity index 100%
rename from ca/index.txt.attr.old
rename to assignment2/ca/index.txt.attr.old
diff --git a/ca/index.txt.old b/assignment2/ca/index.txt.old
similarity index 100%
rename from ca/index.txt.old
rename to assignment2/ca/index.txt.old
diff --git a/ca/revoke_user.sh b/assignment2/ca/revoke_user.sh
old mode 100755
new mode 100644
similarity index 100%
rename from ca/revoke_user.sh
rename to assignment2/ca/revoke_user.sh
diff --git a/ca/serial b/assignment2/ca/serial
similarity index 100%
rename from ca/serial
rename to assignment2/ca/serial
diff --git a/ca/serial.old b/assignment2/ca/serial.old
similarity index 100%
rename from ca/serial.old
rename to assignment2/ca/serial.old
diff --git a/ca/ta.key b/assignment2/ca/ta.key
similarity index 100%
rename from ca/ta.key
rename to assignment2/ca/ta.key
diff --git a/ca/user.crt b/assignment2/ca/user.crt
similarity index 100%
rename from ca/user.crt
rename to assignment2/ca/user.crt
diff --git a/ca/user.csr b/assignment2/ca/user.csr
similarity index 100%
rename from ca/user.csr
rename to assignment2/ca/user.csr
diff --git a/ca/user.key b/assignment2/ca/user.key
similarity index 100%
rename from ca/user.key
rename to assignment2/ca/user.key
diff --git a/ca/vpn.crt b/assignment2/ca/vpn.crt
similarity index 100%
rename from ca/vpn.crt
rename to assignment2/ca/vpn.crt
diff --git a/ca/vpn.csr b/assignment2/ca/vpn.csr
similarity index 100%
rename from ca/vpn.csr
rename to assignment2/ca/vpn.csr
diff --git a/ca/vpn.key b/assignment2/ca/vpn.key
similarity index 100%
rename from ca/vpn.key
rename to assignment2/ca/vpn.key
diff --git a/conf/client.conf b/assignment2/conf/client.conf
similarity index 100%
rename from conf/client.conf
rename to assignment2/conf/client.conf
diff --git a/conf/httpd-totp b/assignment2/conf/httpd-totp
similarity index 100%
rename from conf/httpd-totp
rename to assignment2/conf/httpd-totp
diff --git a/conf/httpd.conf b/assignment2/conf/httpd.conf
similarity index 100%
rename from conf/httpd.conf
rename to assignment2/conf/httpd.conf
diff --git a/conf/ocsp-verify.sh b/assignment2/conf/ocsp-verify.sh
old mode 100755
new mode 100644
similarity index 100%
rename from conf/ocsp-verify.sh
rename to assignment2/conf/ocsp-verify.sh
diff --git a/conf/ssl.conf b/assignment2/conf/ssl.conf
similarity index 100%
rename from conf/ssl.conf
rename to assignment2/conf/ssl.conf
diff --git a/conf/totp b/assignment2/conf/totp
similarity index 100%
rename from conf/totp
rename to assignment2/conf/totp
diff --git a/conf/vpn.conf b/assignment2/conf/vpn.conf
similarity index 100%
rename from conf/vpn.conf
rename to assignment2/conf/vpn.conf
diff --git a/entrega.zip b/assignment2/entrega.zip
similarity index 100%
rename from entrega.zip
rename to assignment2/entrega.zip
diff --git a/entrega.zip.asc b/assignment2/entrega.zip.asc
similarity index 100%
rename from entrega.zip.asc
rename to assignment2/entrega.zip.asc
diff --git a/assignment2/enunciado.pdf b/assignment2/enunciado.pdf
new file mode 100644
index 0000000..535a80f
Binary files /dev/null and b/assignment2/enunciado.pdf differ
diff --git a/enunciado.txt b/assignment2/enunciado.txt
similarity index 100%
rename from enunciado.txt
rename to assignment2/enunciado.txt
diff --git a/relatorio/google-authenticator.jpg b/assignment2/relatorio/google-authenticator.jpg
similarity index 100%
rename from relatorio/google-authenticator.jpg
rename to assignment2/relatorio/google-authenticator.jpg
diff --git a/relatorio/relatorio.aux b/assignment2/relatorio/relatorio.aux
similarity index 100%
rename from relatorio/relatorio.aux
rename to assignment2/relatorio/relatorio.aux
diff --git a/relatorio/relatorio.listing b/assignment2/relatorio/relatorio.listing
similarity index 100%
rename from relatorio/relatorio.listing
rename to assignment2/relatorio/relatorio.listing
diff --git a/relatorio/relatorio.log b/assignment2/relatorio/relatorio.log
similarity index 100%
rename from relatorio/relatorio.log
rename to assignment2/relatorio/relatorio.log
diff --git a/relatorio/relatorio.out b/assignment2/relatorio/relatorio.out
similarity index 100%
rename from relatorio/relatorio.out
rename to assignment2/relatorio/relatorio.out
diff --git a/relatorio.pdf b/assignment2/relatorio/relatorio.pdf
similarity index 100%
rename from relatorio.pdf
rename to assignment2/relatorio/relatorio.pdf
diff --git a/relatorio/relatorio.tex b/assignment2/relatorio/relatorio.tex
similarity index 100%
rename from relatorio/relatorio.tex
rename to assignment2/relatorio/relatorio.tex
diff --git a/relatorio/relatorio.toc b/assignment2/relatorio/relatorio.toc
similarity index 100%
rename from relatorio/relatorio.toc
rename to assignment2/relatorio/relatorio.toc
diff --git a/relatorio/style.sty b/assignment2/relatorio/style.sty
similarity index 100%
rename from relatorio/style.sty
rename to assignment2/relatorio/style.sty
diff --git a/user.p12 b/assignment2/user.p12
similarity index 100%
rename from user.p12
rename to assignment2/user.p12
diff --git a/www/index.html b/assignment2/www/index.html
similarity index 100%
rename from www/index.html
rename to assignment2/www/index.html
diff --git a/www/login.html b/assignment2/www/login.html
similarity index 100%
rename from www/login.html
rename to assignment2/www/login.html
diff --git a/enunciado.pdf b/enunciado.pdf
index 535a80f..4d5bfb7 100644
Binary files a/enunciado.pdf and b/enunciado.pdf differ
diff --git a/relatorio/relatorio.pdf b/relatorio/relatorio.pdf
deleted file mode 100644
index fbf61dc..0000000
Binary files a/relatorio/relatorio.pdf and /dev/null differ