Slightly reorganized project structure.