refactoring class and package identifiers

Hey Ruchit!
I have renamed a few packages and distributed classes into these packages.
Please review the same and any feedback would be appreciated :)

Cheers
-Jehaan