Get right with main

Resynch, delete old files, add new ones.  You know...stuff.