Added excel output (currently slightly broken).
Restructured to clean up root.