updating folder structure

Signed-off-by: Taso  Perdikoulias <taso@clearbridgemobile.com>