DC: cleanup project structure

Change-Id: I5d3f552296df75a69a5b1c72fe61d9e71427866e
DC: rewrite to remove some permissions

Change-Id: If8a50ba0ae2f330f002b54e3e316d32be5986cca