Rearrange project structure

Change-Id: Ie8bc87764ba4e2d5f9621b36b7fcb4995577fd61