Updated project folder & class structure