"Structure" class fixed