GitLab

New naming convention:

/sites
  /cultofmac.com
      index.html
  /reuters.com
      index.html
  /etc.

/trackers
  /facebook.com
     index.html
  /google.com
     index.html
  /etc.

Besides anything else, by using domains for the folder names, we guarantee that they will be unique and can be used as unique identifiers for when we want to add local whitelist functionality.