Updated class and Funnction folder