New structure of the paper

Following discussions with Wendy