Added workbook_structure class, minor corrections