Revert "Fixing imports and refactoring of packages"

This reverts commit 495a7aeb8dfba69353b50395f63cec08795067c7.
Reverting the changes and fixing packages references