diff --git a/research.mdwn b/research.mdwn
index 1a221d57e96f428350aff176c194b23a0cc0cf57..201c62b0febc32ea4d4d66fb2ae3dbd1818cab58 100644
--- a/research.mdwn
+++ b/research.mdwn
@@ -9,34 +9,22 @@ Raw list with things to try, research, evaluate develop and maybe deploy!
 ## New stuff
 
 * [yankee: Changelogs meet YAML](https://github.com/studio-b12/yankee).
-* [Kaitai Struct: declarative binary format parsing language](http://kaitai.io/).
 * [Borg - Deduplicating](http://borgbackup.readthedocs.io/en/stable/).
-* [Darktable](https://packages.debian.org/stable/darktable).
-* [mmv](https://packages.debian.org/jessie/mmv) ([manpage](https://ss64.com/bash/mmv.html)).
+* [gridsync: Synchronize local directories with Tahoe-LAFS storage grids](https://github.com/gridsync/gridsync)
+* [Exhaustive list of backup solutions for Linux](https://github.com/restic/others).
 * [Observatory by Mozilla](https://observatory.mozilla.org/) and [CAA checking becomes mandatory for SSL/TLS certificates](https://ma.ttias.be/caa-checking-becomes-mandatory-ssltls-certificates/).
-* Wayland.
-* [antigen](https://github.com/zsh-users/antigen), [vundle](https://github.com/VundleVim/Vundle.vim), etc.
-* [You-Get](https://you-get.org/).
 * [Apache Drill](https://drill.apache.org/), [presto](https://github.com/prestodb/presto), hadoop, etc.
-* [gridsync/gridsync: Synchronize local directories with Tahoe-LAFS storage grids](https://github.com/gridsync/gridsync)
 * [OpenBSD vmm](https://marc.info/?l=openbsd-tech&m=149191695821636&w=2).
 * [TensorFlow](https://www.tensorflow.org/).
-* [HTTP Prompt - An interactive command-line HTTP client](http://http-prompt.com/).
 * [Mapzen](https://mapzen.com).
-* [GitHub - restic/others: Exhaustive list of backup solutions for Linux](https://github.com/restic/others).
-* [asciinema - Record and share your terminal sessions, the right way](https://asciinema.org/) ([client](https://packages.debian.org/jessie/asciinema) and server).
 * [Creepy - Geolocation OSINT Tool](http://www.geocreepy.com/) ([package](https://packages.debian.org/wheezy/creepy)).
 * [Minix3](http://www.minix3.org/).
-* [Haiku Project](https://www.haiku-os.org/).
-* [GoboLinux - the alternative Linux distribution](http://gobolinux.org/).
-* [Debian -- Details of package stow in jessie](https://packages.debian.org/jessie/stow).
+* [stow](https://packages.debian.org/jessie/stow).
 * [Sabotage - the hardcore let's be oldschool UNIX experience](http://sabotage.tech/).
 * [netboot.xyz](https://netboot.xyz/).
 * [iPXE - open source boot firmware [start]](http://ipxe.org/).
 * [FOSS Services](/services)!
-* [isis' scripts](https://github.com/isislovecruft/scripts).
-* [gitly self-hosted](https://gitly.io).
-* [Git Large File Storage - Git Large File Storage (LFS) replaces large files such as audio samples, videos, datasets, and graphics with text pointers inside Git, while storing the file contents on a remote server like GitHub.com or GitHub Enterprise.](https://git-lfs.github.com/)  / [#792075 - ITP: git-lfs -- Git Large File Support. An open source Git extension for versioning large files - Debian Bug report logs](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=792075).
+* [qsstv](https://packages.debian.org/jessie/qsstv)
 * https://shodan.io
 * https://keybase.io
 * https://en.wikipedia.org/wiki/Unikernel
@@ -47,129 +35,4 @@ Raw list with things to try, research, evaluate develop and maybe deploy!
 * https://lede-project.org/start
 * https://github.com/shadowsocks/shadowsocks-go
 * https://botman.io
-
-## Bibliography management
-
-* [Comparison of reference management software - Wikipedia](https://en.wikipedia.org/wiki/Comparison_of_reference_management_software).
-* [Citeproc YAML for bibliographies](http://blog.martinfenner.org/2013/07/30/citeproc-yaml-for-bibliographies/).
-* BibTeX.
-* [Citation Style Language - Wikipedia](https://en.wikipedia.org/wiki/Citation_Style_Language).
-* [JSON-LD - Wikipedia](https://en.wikipedia.org/wiki/JSON-LD).
-* [Exporting all yaml bibliographic in a pdf file using pandoc - Stack Overflow](http://stackoverflow.com/questions/20077939/exporting-all-yaml-bibliographic-in-a-pdf-file-using-pandoc).
-* [FileMeta/MicroYaml: A simple parser for the MicroYaml dialect of the YAML file format.](https://github.com/FileMeta/MicroYaml).
-* [jtprince/bivy: "bibliography in vim and yaml" is a lightweight bibliographic management system. Create bibliographies and citations with simple tools.](https://github.com/jtprince/bivy)
-* [jbaiter/zotero-cli: Command-line interface for Zotero](https://github.com/jbaiter/zotero-cli).
-* [vhotspur/cli-zotero: Command-line client for Zotero (BibTeX export now only)](https://github.com/vhotspur/cli-zotero).
-* [pandoc-citeproc in stretch](https://packages.debian.org/stretch/pandoc-citeproc).
-
-## Multimedia
-
-* [qsstv](https://packages.debian.org/jessie/qsstv)
-* mopidy/mpdris:
-  * plugins like https://packages.debian.org/stretch/mopidy-podcast
-  * https://packages.debian.org/jessie/mopidy
-  * https://github.com/acrisci/playerctl
-  * https://packages.debian.org/jessie/mpdris2
-  * https://packages.debian.org/stretch/mpris-remote
-
-## Tor
-
-* ooniprobe, lepidopter.
-* onionpi (tor, hostapd, iptables).
-* onion smtp:
-  * https://www.void.gr/kargig/blog/2014/05/10/smtp-over-hidden-services-with-postfix/
-  * https://tech.immerda.ch/2016/12/ehlo-onion/
-  * https://github.com/riseupnet/onionmx
-
-## Security
-
-* [Qubes OS](https://www.qubes-os.org/).
-* bitmask and LEAP.
-* port knocking.
-* hardened systems: apparmor, gradm2, firejail, seccomp, etc.
-* sshd:
-  * https://stribika.github.io/2015/01/04/secure-secure-shell.html
-  * https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=774711#60
-  * http://security.stackexchange.com/questions/64562/how-should-i-defend-against-zero-day-attack-on-ssh
-  * https://charlieharvey.org.uk/page/ssh_port_pros_and_cons
-* fuzzy testing: fusil, etc.
-* router: serial console to other boxes with dhe luks! :)
-* [Mailcap, HTML and AppArmor](http://www.justgohome.co.uk/blog/2014/02/mailcap-html-apparmor.html).
-* Increased security on smtp/imaps password storage:
-  * https://github.com/sup-heliotrope/sup/wiki/Securely-Store-Password
-  * http://serverfault.com/questions/149452/how-can-i-use-fetchmail-or-another-email-grabber-with-osx-keychain-for-authent
-  * http://mah.everybody.org/docs/mail/fetchmail_check
-* Enhanced shell:
-  * Add a counter-measure to prevent SSH timing attacks:
-    http://users.ece.cmu.edu/~dawnsong/papers/ssh-timing.pdf
-    http://www.slideshare.net/idsecconf/countermeasure-against-timing-attack-on-ssh-using-random-delay
-    http://www.scribd.com/doc/59628153/Timing-Analysis-of-Keystrokes-and-Timing-Attacks-on-SSH-Revisited
-
-## DevOps
-
-* [Simet](http://simet.nic.br).
-* auto start user screen sessions.
-* backups: snapshots with remote transfer support.
-* puppet:
-  * deploy: multiple module paths: https://docs.puppet.com/puppet/3.6/dirs_modulepath.html
-  * default modules as submodules from the bootstrap repository, custom modules closer to the config folder?
-* php7-fpm:
-  * https://serversforhackers.com/video/apache-and-php-fpm
-  * http://www.binarytides.com/setup-apache-php-fpm-mod-proxy-fcgi-ubuntu/
-
-    <FilesMatch \.php$>
-      SetHandler "proxy:unix:/run/php/php7.1-fpm.sock|fcgi://localhost:9000";
-    </FilesMatch>
-
-## Virtualization
-
-* kvm:
-  * kvm-manager improvements (systemd support, packaging, docs).
-  * env params.
-  * FDE using bootless image.
-
-## Smartphone
-
-* snoopsnitch.
-* mods: https://web.archive.org/web/20160402005909/https://people.torproject.org/~ioerror/skunkworks/moto_e/
-
-## Torrent
-
-Torrent workflow: torrent-maker, magnet2torrent and torrent-reseed:
-
-* http://wiki.rtorrent.org/MagnetUri
-* http://dan.folkes.me/2012/04/19/converting-a-magnet-link-into-a-torrent/
-* https://github.com/danfolkes/Magnet2Torrent
-* http://code.google.com/p/pyroscope/wiki/CommandLineTools
-* https://trac.transmissionbt.com/ticket/4176
-* http://wiki.rtorrent.org/MagnetUri
-* https://github.com/rakshasa/rtorrent/issues/212
-* saving/restoring `.meta` and `~/rtorrent/.session` files.
-* multiple instances: https://kernelwho.wordpress.com/2011/11/15/running-multiple-instances-of-rtorrent/
-
-    rtorrent -n -o import=/home/user/.rtorrent1.rc
-
-## Git
-
-* signed commits:
-  * check using gpgv?
-  * [Validating other keys on your public keyring](https://www.gnupg.org/gph/en/manual/x334.html)
-  * https://git-annex.branchable.com/tips/using_signed_git_commits/
-  * http://stackoverflow.com/questions/17371955/verifying-signed-git-commits
-  * https://git-scm.com/book/en/v2/Git-Tools-Signing-Your-Work
-  * https://mikegerwitz.com/papers/git-horror-story.html
-* Push-to-deploy plugin:
-  * http://superuser.com/questions/230694/how-can-i-push-a-git-repository-to-a-folder-over-ssh
-  * https://devcenter.heroku.com/articles/git
-  * https://github.com/blog/1957-git-2-3-has-been-released (push-to-deploy)
-  * https://github.com/git/git/blob/v2.3.0/Documentation/config.txt#L2155
-  * http://stackoverflow.com/questions/1764380/push-to-a-non-bare-git-repository
-  * http://bitflop.com/tutorials/git-bare-vs-non-bare-repositories.html
-* Write a "git" interceptor:
-  * Check proper user/email config.
-  * Automatically set git-flow when initializing a repository.
-  * Automatically set git-hooks integration.
-  * Implement global hooks.
-  * Check remote configuration.
-  * Check hook tampering before doing anything in the repository.
-  * That can disable/mitigate hooks by changing permission and ownership on `~/.git/hooks`.
+* tor: ooniprobe, lepidopter, onionpi (tor, hostapd, iptables).
diff --git a/research/archive.mdwn b/research/archive.mdwn
new file mode 100644
index 0000000000000000000000000000000000000000..8f8367f3888941af86250d126d298ed2ea0af020
--- /dev/null
+++ b/research/archive.mdwn
@@ -0,0 +1,19 @@
+[[!meta title="Archived Research"]]
+
+Currently archived research.
+
+* Wayland.
+* [antigen](https://github.com/zsh-users/antigen), [vundle](https://github.com/VundleVim/Vundle.vim), etc.
+* [Kaitai Struct: declarative binary format parsing language](http://kaitai.io/).
+* [Darktable](https://packages.debian.org/stable/darktable).
+* [Haiku Project](https://www.haiku-os.org/).
+* [GoboLinux - the alternative Linux distribution](http://gobolinux.org/).
+* [asciinema - Record and share your terminal sessions, the right way](https://asciinema.org/) ([client](https://packages.debian.org/jessie/asciinema) and server).
+* [HTTP Prompt - An interactive command-line HTTP client](http://http-prompt.com/).
+* [mmv](https://packages.debian.org/jessie/mmv) ([manpage](https://ss64.com/bash/mmv.html)).
+* mopidy/mpdris:
+  * plugins like https://packages.debian.org/stretch/mopidy-podcast
+  * https://packages.debian.org/jessie/mopidy
+  * https://github.com/acrisci/playerctl
+  * https://packages.debian.org/jessie/mpdris2
+  * https://packages.debian.org/stretch/mpris-remote
diff --git a/research/biblio.mdwn b/research/biblio.mdwn
new file mode 100644
index 0000000000000000000000000000000000000000..374af854bec37dce11453d39a8a6d453e699d4d3
--- /dev/null
+++ b/research/biblio.mdwn
@@ -0,0 +1,13 @@
+[[!meta title="Bibliography management"]]
+
+* [Comparison of reference management software - Wikipedia](https://en.wikipedia.org/wiki/Comparison_of_reference_management_software).
+* [Citeproc YAML for bibliographies](http://blog.martinfenner.org/2013/07/30/citeproc-yaml-for-bibliographies/).
+* BibTeX.
+* [Citation Style Language - Wikipedia](https://en.wikipedia.org/wiki/Citation_Style_Language).
+* [JSON-LD - Wikipedia](https://en.wikipedia.org/wiki/JSON-LD).
+* [Exporting all yaml bibliographic in a pdf file using pandoc - Stack Overflow](http://stackoverflow.com/questions/20077939/exporting-all-yaml-bibliographic-in-a-pdf-file-using-pandoc).
+* [FileMeta/MicroYaml: A simple parser for the MicroYaml dialect of the YAML file format.](https://github.com/FileMeta/MicroYaml).
+* [jtprince/bivy: "bibliography in vim and yaml" is a lightweight bibliographic management system. Create bibliographies and citations with simple tools.](https://github.com/jtprince/bivy)
+* [jbaiter/zotero-cli: Command-line interface for Zotero](https://github.com/jbaiter/zotero-cli).
+* [vhotspur/cli-zotero: Command-line client for Zotero (BibTeX export now only)](https://github.com/vhotspur/cli-zotero).
+* [pandoc-citeproc in stretch](https://packages.debian.org/stretch/pandoc-citeproc).
diff --git a/research/devops.mdwn b/research/devops.mdwn
new file mode 100644
index 0000000000000000000000000000000000000000..58bf471a3cd6624a3de0a594b4dbbaa34e894ba6
--- /dev/null
+++ b/research/devops.mdwn
@@ -0,0 +1,25 @@
+[[!meta title="DevOps"]]
+
+DevOps research:
+
+* [Simet](http://simet.nic.br).
+* auto start user screen sessions.
+* backups: snapshots with remote transfer support.
+* puppet:
+  * deploy: multiple module paths: https://docs.puppet.com/puppet/3.6/dirs_modulepath.html
+  * default modules as submodules from the bootstrap repository, custom modules closer to the config folder?
+* onion smtp:
+  * https://www.void.gr/kargig/blog/2014/05/10/smtp-over-hidden-services-with-postfix/
+  * https://tech.immerda.ch/2016/12/ehlo-onion/
+  * https://github.com/riseupnet/onionmx
+* kvm:
+  * kvm-manager improvements (systemd support, packaging, docs).
+  * env params.
+  * FDE using bootless image.
+* php7-fpm:
+  * https://serversforhackers.com/video/apache-and-php-fpm
+  * http://www.binarytides.com/setup-apache-php-fpm-mod-proxy-fcgi-ubuntu/
+
+    <FilesMatch \.php$>
+      SetHandler "proxy:unix:/run/php/php7.1-fpm.sock|fcgi://localhost:9000";
+    </FilesMatch>
diff --git a/research/git.mdwn b/research/git.mdwn
new file mode 100644
index 0000000000000000000000000000000000000000..8bb4953d41ebf58e9cd052127db14b4cc610f6c0
--- /dev/null
+++ b/research/git.mdwn
@@ -0,0 +1,28 @@
+[[!meta title="Git"]]
+
+Git research and development.
+
+* [gitly self-hosted](https://gitly.io).
+* [Git Large File Storage - Git Large File Storage (LFS) replaces large files such as audio samples, videos, datasets, and graphics with text pointers inside Git, while storing the file contents on a remote server like GitHub.com or GitHub Enterprise.](https://git-lfs.github.com/)  / [#792075 - ITP: git-lfs -- Git Large File Support. An open source Git extension for versioning large files - Debian Bug report logs](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=792075).
+* signed commits:
+  * check using gpgv?
+  * [Validating other keys on your public keyring](https://www.gnupg.org/gph/en/manual/x334.html)
+  * https://git-annex.branchable.com/tips/using_signed_git_commits/
+  * http://stackoverflow.com/questions/17371955/verifying-signed-git-commits
+  * https://git-scm.com/book/en/v2/Git-Tools-Signing-Your-Work
+  * https://mikegerwitz.com/papers/git-horror-story.html
+* Push-to-deploy plugin:
+  * http://superuser.com/questions/230694/how-can-i-push-a-git-repository-to-a-folder-over-ssh
+  * https://devcenter.heroku.com/articles/git
+  * https://github.com/blog/1957-git-2-3-has-been-released (push-to-deploy)
+  * https://github.com/git/git/blob/v2.3.0/Documentation/config.txt#L2155
+  * http://stackoverflow.com/questions/1764380/push-to-a-non-bare-git-repository
+  * http://bitflop.com/tutorials/git-bare-vs-non-bare-repositories.html
+* Write a "git" interceptor:
+  * Check proper user/email config.
+  * Automatically set git-flow when initializing a repository.
+  * Automatically set git-hooks integration.
+  * Implement global hooks.
+  * Check remote configuration.
+  * Check hook tampering before doing anything in the repository.
+  * That can disable/mitigate hooks by changing permission and ownership on `~/.git/hooks`.
diff --git a/research/security.mdwn b/research/security.mdwn
new file mode 100644
index 0000000000000000000000000000000000000000..fdfd853529d611f1363b33e4170cc4550b5df014
--- /dev/null
+++ b/research/security.mdwn
@@ -0,0 +1,25 @@
+[[!meta title="Security"]]
+
+Research and development in security:
+
+* [Qubes OS](https://www.qubes-os.org/).
+* bitmask and LEAP.
+* port knocking.
+* hardened systems: apparmor, gradm2, firejail, seccomp, etc.
+* sshd:
+  * https://stribika.github.io/2015/01/04/secure-secure-shell.html
+  * https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=774711#60
+  * http://security.stackexchange.com/questions/64562/how-should-i-defend-against-zero-day-attack-on-ssh
+  * https://charlieharvey.org.uk/page/ssh_port_pros_and_cons
+* fuzzy testing: fusil, etc.
+* router: serial console to other boxes with dhe luks! :)
+* [Mailcap, HTML and AppArmor](http://www.justgohome.co.uk/blog/2014/02/mailcap-html-apparmor.html).
+* Increased security on smtp/imaps password storage:
+  * https://github.com/sup-heliotrope/sup/wiki/Securely-Store-Password
+  * http://serverfault.com/questions/149452/how-can-i-use-fetchmail-or-another-email-grabber-with-osx-keychain-for-authent
+  * http://mah.everybody.org/docs/mail/fetchmail_check
+* Enhanced shell:
+  * Add a counter-measure to prevent SSH timing attacks:
+    http://users.ece.cmu.edu/~dawnsong/papers/ssh-timing.pdf
+    http://www.slideshare.net/idsecconf/countermeasure-against-timing-attack-on-ssh-using-random-delay
+    http://www.scribd.com/doc/59628153/Timing-Analysis-of-Keystrokes-and-Timing-Attacks-on-SSH-Revisited
diff --git a/research/smartphone.mdwn b/research/smartphone.mdwn
index c40e7111d38a4a3d082990bf4b62ab82bbae5c3b..2a161ca87a83b7defcc9c523788bccdbaef4ef1d 100644
--- a/research/smartphone.mdwn
+++ b/research/smartphone.mdwn
@@ -106,4 +106,6 @@ Dicas
 Referências
 -----------
 
+* Aplicativos interessantes: snoopsnitch.
+* [Modificações](https://web.archive.org/web/20160402005909/https://people.torproject.org/~ioerror/skunkworks/moto_e/).
 * [List of custom android firmware](https://en.wikipedia.org/wiki/List_of_custom_Android_firmware).
diff --git a/research/torrent.mdwn b/research/torrent.mdwn
new file mode 100644
index 0000000000000000000000000000000000000000..501c351b63d8d824deb5b909863bbe8282f8e6bd
--- /dev/null
+++ b/research/torrent.mdwn
@@ -0,0 +1,15 @@
+[[!meta title="BitTorrent"]]
+
+Torrent workflow: torrent-maker, magnet2torrent and torrent-reseed plan:
+
+* http://wiki.rtorrent.org/MagnetUri
+* http://dan.folkes.me/2012/04/19/converting-a-magnet-link-into-a-torrent/
+* https://github.com/danfolkes/Magnet2Torrent
+* http://code.google.com/p/pyroscope/wiki/CommandLineTools
+* https://trac.transmissionbt.com/ticket/4176
+* http://wiki.rtorrent.org/MagnetUri
+* https://github.com/rakshasa/rtorrent/issues/212
+* saving/restoring `.meta` and `~/rtorrent/.session` files.
+* multiple instances: https://kernelwho.wordpress.com/2011/11/15/running-multiple-instances-of-rtorrent/
+
+    rtorrent -n -o import=/home/user/.rtorrent1.rc
diff --git a/services.mdwn b/services.mdwn
index 1d1b0ac661e1d2f2fb418243672bdb32de6fd28a..6ba0842a6ca18cc269198631789d1f89dab62cfb 100644
--- a/services.mdwn
+++ b/services.mdwn
@@ -90,7 +90,6 @@ Infostructure
   * [lantern](https://github.com/madeye/lantern).
   * [meek](https://trac.torproject.org/projects/tor/wiki/doc/meek).
 
-
 Social media
 ------------
 
@@ -116,6 +115,7 @@ Social media
 * [Twister](http://twister.net.co/).
 * [RedMatrix](https://redmatrix.me/).
 * [Hubzilla](http://hubzilla.org/).
+* [commento: A lightweight, open source, tracking-free comment engine alternative to Disqus](https://github.com/adtac/commento)
 
 Maps
 ----