fix: package structure problem and dependencies

[saeedark]

Thank you, There are some similar chores left. I'll merge this once I've done them.