Resolve project import issues

Resolved