Massive 0.21 overhaul

Check file compare, changed a lot.
Cleaned up unused files.