Modified folder structure.

Change-Id: Ie89635f6d73cf67be52502b3825ac56f978cbd37
Signed-off-by: fism <xanieth@xanieth.com>