Update Project Structure

Change-Id: I302a7bce392bfe5ff4048fd4292ecab95738e149