Revert "Conform to AOSP moto directory"

This reverts commit e481f88d657c03dd8df90d9c497bda3eae645ae8.