More project structure updates.