Pump to 0.6 version and a bunch of renaming and remove unused stuff