New folder struct to better compression