Update folder struct and add classes and functions for them