FIX: structure, readme, cleaning

It's in the title.