Refactored protein -> structure. Makes more sense if RNA/DNA is to be included.
Changed macro names to avoid future conflicts
Added skeleton for new classification interface.