Merge branch 'reorganize_files' of git.ndn.cx:cavote