Reorganisation

and icons for ios7