Re-organize files, re-write code to standardize locations of include files. Delete unnecessary files.