Reorder fiels and Readme