Remove broken symlink.
Flatten directory hierarchy by one level
Merge into 'master' branch

* master:
  Flatten directory hierarchy by one level
  Remove broken symlink.