update. clavin, dupira and freebase now working properly together with the Structure class