Fix the directory tree to match packaging conventions
Fixing imports