Restructured project again.