Added a cleaned-up main file; deleted an outdated one.