Restructured project part 2.