Change Strucutre to Search by structure on comp info. closes #29