Reorganized project dir structure.