Big structure change, refs #1