Adding folders to organize sites

  * Updated links to be context-aware