Restructure to remove dot imports.