Reorganized project structure a bit.