Modified folder structure.

Change-Id: Ic87e45c6e0300b598b41b972f76ca991d9b1499c
Signed-off-by: Michael Fisher <jalakschwad@gmail.com>