cleaned up filenames and dir structure

Change-Id: Ifbb8941e916a586db0f71cbc734cadd8b2ade791