Updated readme,
Rearranged some source