Revert "refractoring to be in compliance with package naming convetions"

This reverts commit 68cffe0ec163bbf434dae78d1d5e589346b6a9eb.