Reorganizing code
Updating readme