Code Base Structure Change

Signed-off-by: AkilaPeiris <akila.peiris@hotmail.com>