Restructure of packages and modules (Still need to check all imports for
errors)