Restructured project #2.