moved some files around so as to make debian package
maintenance a bit easier
tested build and install locally

Bug: T196066
Change-Id: Ie2d8c041f56ba795689b91c3878540313b9e50e1