Updates for project structure