Reworking spice files.
17 files changed