Restructured project layout