symlink of convenience

Change-Id: I064994ab91bcd77f3d7b3a211afc96abaa0010e3
TODO: make modules/ the real container.
Merge "symlink of convenience"