Reorganized the folders
Merge branch 'office' into home

* office:
  Reorganized the folders