Change imports to match file structure