2.0 Update

Update to 2.0, turned the duck the other way, cleaned up unnecessary
files.