Efforts to fix build process and set up appropriate imports.