Restructuring packages into directories.
Correcting internal imports.

Correcting the imports needed for each function in the packages.