Revert "Refarctoring packages, Logging, minor changes"

This reverts commit b52bf0a8d65f2a4a60c9cdeb35dca899ba867348.
Update