Code rearrangement
Change readme