Restructured project for final