Restructured, now working with parameter files.