Added function folder and comp folder