Fix bug with project structure