Use new package import structure

[avanbrunt-cb]

Pull request checklist

Please check if your PR fulfills the following requirements:

• [x] Docs have been reviewed and added / updated if needed (for bug fixes / features)
• [x] Tests have been added that prove the fix is effective or that the feature works.
• [x] New and existing tests pass locally with the changes.
• [x] Code follows the style guidelines of this project (PEP8, clean code).
• [x] Linter has passed locally and any fixes were made for failures.
• [x] A self-review of the code has been done.

Pull request type

Please check the type of change your PR introduces:

• [x] Bugfix
• [ ] Feature
• [ ] Code style update (formatting, renaming)
• [ ] Refactoring (no functional changes, no api changes)
• [ ] Build related changes
• [ ] Documentation content changes (not tied to bugs/features)
• [ ] Other (please describe):

What is the ticket or issue number?

N/A

Pull Request Description

Reseting to original functional package structure

Does this introduce a breaking change?

• [ ] Yes
• [x] No

How Has This Been Tested?

Local unit tests pass