Remove main/ to match upstream tree structure.

Change-Id: I4863062f578e14290ab1b006c3a6d1f3cca2f7ae