Massive update for 2.0

A complete overhaul of the main code and a bit on the README