Minor tweaks to project structure.