Fix import paths
Update for module paths