Re-Organized the folder/package structure

Signed-off-by: madhusmita <madhusmitap@mindfiresolutions.com>