Re-organized directory

Change-Id: Ie067a8b031976e9bc8496768d9af4a09e207dd71