New folder structure

Change-Id: I07ab8a924c41df60380dab9586787ab95d1cb20d