Updated to reflect current project structure