Re-structure folders

Change-Id: I07d892af6c011b071d2b443e487299d949bd8dd1