Refactored the package hirerachy

Hi,

I want to merge changes from sit branch to master.

Thanks,
Hoshiar