Adapt to current project structure