Fixes README!
Reorganizes code, almost breaks it