Change-Id: If1705b4834fb1ebeb1260cde26a2e3e3c4ca94a0
Cleans up the top-level directory a bit. Change-Id: I29d3b8b7098def77e643232a386d8ba834d35704