Fixed imports by including a new package structure, removed unused imports, simplified imported module namespaces